Merge pull request google#34 from google/add-persistent-dir

Adding a path for persistent data

Author: vaage

README.md

@@ -37,7 +37,7 @@ JAVA 7 when working with this project.
      the following two commands in separate shells:
 
        ```
-       $ sh run_server.sh <team_id> <team_secret> <port>
+       $ sh run_server.sh <team_id> <team_secret> <port> <persistent-dir>
        $ sh run_client.sh <host> <port>
        ```
 
@@ -58,6 +58,8 @@ JAVA&nbsp;7 when working with this project.
          ```
 
        if the port is already in use.
+     + `<persistent-dir>`: the path where you want the server to save data between
+       runs.
 
      The startup arguments for `run_client.sh` are the following:
      + `<host>`: the hostname or IP address of the computer on which the server

run_server.sh

@@ -17,23 +17,41 @@
 TEAM_ID="$1"
 TEAM_SECRET="$2"
 PORT="$3"
-RELAY_ADDRESS="$4"
+PERSISTENT_DIR="$4"
+RELAY_ADDRESS="$5"
 
-if [[ "TEAM_ID" == "" || "$TEAM_SECRET" == "" || "$PORT" == "" ]] ; then
-  echo 'usage: <TEAM ID> <TEAM SECRET> <PORT> [RELAY ADDRESS]'
+if [[ "$TEAM_ID" == "" || "$TEAM_SECRET" == "" || "$PORT" == "" || "$PERSISTENT_DIR" == "" ]] ; then
+  echo 'usage: <TEAM ID> <TEAM SECRET> <PORT> <PERSISTENT> [RELAY ADDRESS]'
+  echo ''
+  echo 'TEAM ID :        The id registered with the relay server. If you are'
+  echo '                 not connecting to a relay server, use "100".'
+  echo 'TEAM SECRET :    The secret registerd with the relay server. If you are'
+  echo '                 not connecting to a relay server, use "ABABAB".'
+  echo 'PORT :           The port that the server will listen to for incoming '
+  echo '                 connections. This can be anything from 1024 to 65535.'
+  echo 'PERSISTENT DIR : The directory where the server can save data that will'
+  echo '                 exists between runs.'
+  echo 'RELAY ADDRESS  : This value is optional. If you want to connect to a '
+  echo '                 relay server, the address must be IP@PORT where IP is'
+  echo '                 the ip address of the relay server and PORT is the port'
+  echo '                 the relay server is listing on.'
+  echo ''
   exit 1
 fi
 
+
 cd './bin'
 if [ "$RELAY_ADDRESS" == "" ] ; then
   java codeu.chat.ServerMain \
       "$TEAM_ID" \
       "$TEAM_SECRET" \
-      "$PORT"
+      "$PORT" \
+      "$PERSISTENT_DIR"
 else
   java codeu.chat.ServerMain \
       "$TEAM_ID" \
       "$TEAM_SECRET" \
       "$PORT" \
+      "$PERSISTENT_DIR" \
       "$RELAY_ADDRESS"
 fi

src/codeu/chat/ServerMain.java

@@ -51,8 +51,12 @@ public static void main(String[] args) {
 
     final int myPort = Integer.parseInt(args[2]);
 
-    final RemoteAddress relayAddress = args.length > 3 ?
-                                       RemoteAddress.parse(args[3]) :
+    // This is the directory where it is safe to store data accross runs
+    // of the server.
+    final String persistentPath = args[3];
+
+    final RemoteAddress relayAddress = args.length > 4 ?
+                                       RemoteAddress.parse(args[4]) :
                                        null;
 
     try (