Merge pull request #10 from google/relay-load-team-data

Load Team Info into Relay

Author: vaage

run_relay.sh

@@ -14,5 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+TEAMS_FILE="$(pwd)/teams"
+
 cd './bin'
-java codeu.chat.RelayMain "2008"
+java codeu.chat.RelayMain '2008' "$TEAMS_FILE"

src/codeu/chat/RelayMain.java

@@ -14,8 +14,13 @@
 
 package codeu.chat;
 
+import java.io.BufferedReader;
+import java.io.FileReader;
 import java.io.IOException;
 
+import codeu.chat.common.Secret;
+import codeu.chat.common.Uuid;
+import codeu.chat.common.Uuids;
 import codeu.chat.relay.Server;
 import codeu.chat.relay.ServerFrontEnd;
 import codeu.chat.util.Logger;
@@ -44,34 +49,41 @@ public static void main(String[] args) {
 
     try (final ConnectionSource source = ServerConnectionSource.forPort(myPort)) {
 
+      // Limit the number of messages that the server tracks to be 1024 and limit the
+      // max number of messages that the relay will send out to be 16.
+      final Server relay = new Server(1024, 16);
+
+      LOG.info("Relay object created.");
+
+      LOG.info("Loading team data...");
+
+      loadTeamInfo(relay, args[1]);
+
+      LOG.info("Done loading team data.");
+
       LOG.info("Starting relay...");
 
-      startRelay(source);
+      startRelay(relay, source);
 
     } catch (IOException ex) {
       LOG.error(ex, "Failed to establish server accept port");
     }
   }
 
-  private static void startRelay(ConnectionSource source) {
-
-    final Server relay = new Server(1024, 16);
-    LOG.info("Relay object created.");
-
+  private static void startRelay(Server relay, ConnectionSource source) {
+    
     final ServerFrontEnd frontEnd = new ServerFrontEnd(relay);
     LOG.info("Relay front end object created.");
 
     final Timeline timeline = new Timeline();
     LOG.info("Relay timeline created.");
 
-    // TODO: Load team information
-
     LOG.info("Starting relay main loop...");
 
     while (true) {
       try {
 
-        LOG.info("Established connection...");
+        LOG.info("Establishing connection...");
         final Connection connection = source.connect();
         LOG.info("Connection established.");
 
@@ -91,4 +103,41 @@ public void run() {
       }
     }
   }
+
+  private static void loadTeamInfo(Server relay, String file) {
+
+    try (final BufferedReader reader = new BufferedReader(new FileReader(file))) {
+
+      String line;
+      for (line = reader.readLine();
+           line != null;
+           line = reader.readLine()) {
+
+        line = line.trim();
+
+        if (line.startsWith("#")) {
+          // this is a comment, skip it
+        } else {
+
+          try {
+
+            final String[] tokens = line.split(":");
+
+            // There are just so many things that could go wrong when parsing
+            // this line that it is not worth trying to handle ahead of time.
+            // So instead just try to parse it and catch any exception.
+
+            final Uuid id = Uuids.fromString(tokens[0].trim());
+            final byte[] secret = Secret.parse(tokens[1].trim());
+
+            relay.addTeam(id, secret);
+          } catch (Exception ex) {
+            LOG.error(ex, "Skipping line \"%s\". Could not parse", line);
+          }
+        }
+      }
+    } catch (IOException ex) {
+      LOG.error(ex, "Failed to load team data");
+    }
+  }
 }

teams

@@ -0,0 +1,3 @@
+# sample team
+# this will match the values in the run_server.sh
+100.101:ABABAB