Merge branch 'master' into fix_messages

Author: vaage

src/codeu/chat/RelayMain.java

@@ -54,29 +54,38 @@ public static void main(String[] args) {
 
       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(relay, source);
+      startRelay(relay, source, args[1]);
 
     } catch (IOException ex) {
       LOG.error(ex, "Failed to establish server accept port");
     }
   }
 
-  private static void startRelay(Server relay, ConnectionSource source) {
+  private static void startRelay(final Server relay,
+                                 final ConnectionSource source,
+                                 final String teamFile) {
 
     final ServerFrontEnd frontEnd = new ServerFrontEnd(relay);
     LOG.info("Relay front end object created.");
 
     final Timeline timeline = new Timeline();
     LOG.info("Relay timeline created.");
 
+    timeline.scheduleNow(new Runnable() {
+      @Override
+      public void run() {
+        LOG.info("Loading team data...");
+        loadTeamInfo(relay, teamFile);
+        LOG.info("Done loading team data.");
+
+        // Add this again in 1 minute so that new team entries will be added to
+        // the relay. This won't support updating entries.
+        timeline.scheduleIn(60000, this);
+      }
+    });
+
     LOG.info("Starting relay main loop...");
 
     while (true) {