Skip to content

Commit

Permalink
update JAR version in docs/site and the startup scritps (relates to #16)
Browse files Browse the repository at this point in the history
  • Loading branch information
tobyweston committed Oct 9, 2017
1 parent ecc2490 commit b823aad
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion site/src/main/tut/docs/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ In terms of deployment (running the temperature-machine software), you have thre

1. Build and run from source
1. Download a pre-installed Raspian image with the above pre-done
1. Download the binary distribution (`temperature-machine-2.0.jar`) and run manually
1. Download the binary distribution (`temperature-machine-2.1.jar`) and run manually

4 changes: 2 additions & 2 deletions site/src/main/tut/docs/getting_started/download.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ If you already have Java and SBT setup, you can run download the binary from the

Just run the following to start the server up.

java -jar temperature-machine-2.0.jar bad.robot.temperature.server.Server garage bedroom
java -jar temperature-machine-2.1.jar bad.robot.temperature.server.Server garage bedroom

or

java -jar temperature-machine-2.0.jar bad.robot.temperature.client.Client
java -jar temperature-machine-2.1.jar bad.robot.temperature.client.Client


to start up the client.
2 changes: 1 addition & 1 deletion site/src/main/tut/docs/hacking.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The `resources` folder is statically served by `Server.scala`.

## Build Deployment JAR

Run the following to produce the `temperature-machine-2.0.jar` file.
Run the following to produce the `temperature-machine-2.1.jar` file.

sbt assembly

Expand Down
2 changes: 1 addition & 1 deletion site/src/main/tut/docs/rrd.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ A round robin database is a fixed size database meaning you can leave the data l

Because we have to define what's in the RRD upfront, you'll have to delete the `~/.temperature/temperature.rdd` if the configuration changes. Starting the server for the first time will initialise the RRD; it will create "archives" for every machine it's expecting to monitor. These are passed in as command line arguments when you start up the server (for example `kitchen`, `garage` and `bedroom`).

$ java -jar temperature-machine-2.0.jar bad.robot.temperature.server.Server kitchen garage bedroom
$ java -jar temperature-machine-2.1.jar bad.robot.temperature.server.Server kitchen garage bedroom

> Don't forget to set the hostname of each machine to match. So for the above, the server might be named `kitchen` and a RRD "archive" will be created along with `garage` and `kitchen`. If a client with a hostname of `outside` connects, it won't have an archive to write data to and you won't be able to log it's temperatures.
Expand Down
2 changes: 1 addition & 1 deletion start-client.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

IP=$( ifconfig wlan0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}' )
nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$IP -cp target/scala-2.12/temperature-machine-2.0.jar bad.robot.temperature.client.Client > temperature-machine.log 2>&1 &
nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$IP -cp target/scala-2.12/temperature-machine-2.1.jar bad.robot.temperature.client.Client > temperature-machine.log 2>&1 &

echo "$!" > temperature-machine.pid

Expand Down
2 changes: 1 addition & 1 deletion start-server.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
args=("$@")

IP=$( ifconfig wlan0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}' )
nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$IP -cp target/scala-2.12/temperature-machine-2.0.jar bad.robot.temperature.server.Server $@ > temperature-machine.log 2>&1 &
nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$IP -cp target/scala-2.12/temperature-machine-2.1.jar bad.robot.temperature.server.Server $@ > temperature-machine.log 2>&1 &

echo "$!" > temperature-machine.pid

Expand Down
2 changes: 1 addition & 1 deletion start.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

IP=$( ifconfig wlan0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}' )
nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$IP -jar target/scala-2.12/temperature-machine-2.0.jar > temperature-machine.log 2>&1 &
nohup java -Xmx512m -Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=1616 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=$IP -jar target/scala-2.12/temperature-machine-2.1.jar > temperature-machine.log 2>&1 &

echo "$!" > temperature-machine.pid

Expand Down

0 comments on commit b823aad

Please sign in to comment.