Merge branch 'master' into relay-load-team-data

Author: vaage

src/codeu/chat/RelayMain.java

@@ -18,13 +18,13 @@
 import java.io.FileReader;
 import java.io.IOException;
 
-import codeu.chat.common.Hub;
 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;
+import codeu.chat.util.Timeline;
 import codeu.chat.util.connections.Connection;
 import codeu.chat.util.connections.ConnectionSource;
 import codeu.chat.util.connections.ServerConnectionSource;
@@ -49,6 +49,8 @@ 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.");
@@ -69,36 +71,37 @@ public static void main(String[] args) {
   }
 
   private static void startRelay(Server relay, ConnectionSource source) {
-
+    
     final ServerFrontEnd frontEnd = new ServerFrontEnd(relay);
-
     LOG.info("Relay front end object created.");
 
-    LOG.info("Starting relay main loop...");
-
-    final Runnable hub = new Hub(source, new Hub.Handler() {
-
-      @Override
-      public void handle(Connection connection) throws Exception {
-
-        frontEnd.handleConnection(connection);
-
-      }
+    final Timeline timeline = new Timeline();
+    LOG.info("Relay timeline created.");
 
-      @Override
-      public void onException(Exception ex) {
+    LOG.info("Starting relay main loop...");
 
-        System.out.println("ERROR: front end failed to handle connection. Check log for details.");
-        LOG.error(ex, "Exception handling connection.");
+    while (true) {
+      try {
+
+        LOG.info("Establishing connection...");
+        final Connection connection = source.connect();
+        LOG.info("Connection established.");
+
+        timeline.scheduleNow(new Runnable() {
+          @Override
+          public void run() {
+            try {
+              frontEnd.handleConnection(connection);
+            } catch (Exception ex) {
+              LOG.error(ex, "Exception handling connection.");
+            }
+          }
+        });
 
+      } catch (IOException ex) {
+        LOG.error(ex, "Failed to establish connection.");
       }
-    });
-
-    LOG.info("Starting hub...");
-
-    hub.run();
-
-    LOG.info("Hub exited.");
+    }
   }
 
   private static void loadTeamInfo(Server relay, String file) {

src/codeu/chat/ServerMain.java

@@ -17,7 +17,6 @@
 
 import java.io.IOException;
 
-import codeu.chat.common.Hub;
 import codeu.chat.common.Relay;
 import codeu.chat.common.Secret;
 import codeu.chat.common.Uuid;
@@ -83,30 +82,21 @@ private static void runServer(Uuid id,
 
     final Server server = new Server(id, secret, relay);
 
-    LOG.info("Server object created.");
+    LOG.info("Created server.");
 
-    final Runnable hub = new Hub(serverSource, new Hub.Handler() {
+    while (true) {
 
-      @Override
-      public void handle(Connection connection) throws Exception {
+      try {
 
-        server.handleConnection(connection);
-
-      }
+        LOG.info("Established connection...");
+        final Connection connection = serverSource.connect();
+        LOG.info("Connection established.");
 
-      @Override
-      public void onException(Exception ex) {
-
-        System.out.println("ERROR: Exception during server tick. Check log for details.");
-        LOG.error(ex, "Exception during server tick.");
+        server.handleConnection(connection);
 
+      } catch (IOException ex) {
+        LOG.error(ex, "Failed to establish connection.");
       }
-    });
-
-    LOG.info("Starting hub...");
-
-    hub.run();
-
-    LOG.info("Hub exited.");
+    }
   }
 }