update relayserver so if cwd is passed in we can figure out the gameI…

…d from package.json
greggman · Sep 9, 2014 · 36e3d50 · 36e3d50
1 parent 835c5a5
commit 36e3d50
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/server/relayserver.js b/server/relayserver.js
@@ -213,7 +213,14 @@ var RelayServer = function(servers, options) {
       if (path.basename(cwd) == "bin") {
         cwd = path.dirname(cwd);
       }
-      gameId = gameInfo.makeRuntimeGameId(gameId, cwd);
+      try {
+        var runtimeInfo = gameInfo.readGameInfo(path.join(cwd));
+        if (runtimeInfo) {
+          gameId = runtimeInfo.info.happyFunTimes.gameId;
+        }
+      } catch (e) {
+        gameId = gameInfo.makeRuntimeGameId(gameId, cwd);
+      }
     }
     debug("starting game: " + gameId);
     eventEmitter.emit('gameStarted', {gameId: gameId});