Fix client side reload race condition

arbesfeld · arbesfeld · commit 5faf65e347dc · 2014-08-19T18:34:17.000-07:00
There was a race condition between the bundle process and when we established
the client watch set. We now store the future for the old bundle process so
that it cannot be invalidated.
diff --git a/tools/run-app.js b/tools/run-app.js
@@ -611,15 +611,18 @@ _.extend(AppRunner.prototype, {
           };
         }
 
-        // Establish a watcher on the new files.
-        setupClientWatcher();
+        var oldFuture = self.runFuture = new Future;
 
         // Notify the server that new client assets have been added to the build.
         process.kill(appProcess.proc.pid, 'SIGUSR2');
+
+        // Establish a watcher on the new files.
+        setupClientWatcher();
+
         runLog.logClientRestart();
 
-        self.runFuture = new Future;
-        ret = self.runFuture.wait();
+        // Wait until another file changes.
+        ret = oldFuture.wait();
       }
     } finally {
       self.runFuture = null;
