Refactored and fixed error when linkin to worker.

dccp · May 18, 2015 · fc84508 · fc84508
1 parent eed79d8
commit fc84508
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/server.js b/server.js
@@ -34,9 +34,9 @@ app.post('/receive', function(req, res) {
     sse.send({'type': 'start'});
     dockerx.server.receive(name, port).then((imageHash) => {
         let servePort = 7021;
-        dockerx.run(imageHash, servePort);
         console.log(timestamp() + " FINISHED, running at port: " + servePort + "\n");
         sse.send({'type': 'finished', 'port': servePort})
+        dockerx.run(imageHash, servePort);
     });
 
     // response to post request:

diff --git a/src/components/ClientPanel.jsx b/src/components/ClientPanel.jsx
@@ -171,7 +171,7 @@ let ClientAgreement = React.createClass({
         }
         let address = workerInfo[1] + ":" + port;
         if (port) {
-            address = (<a href="http://{address}">{address}</a>);
+            address = (<a href={"http://" + address}>{address}</a>);
         }
         return (
             <span>

diff --git a/src/main.jsx b/src/main.jsx
@@ -16,6 +16,7 @@ import "bootstrap";
 let DefaultRoute = Router.DefaultRoute;
 let RouteHandler = Router.RouteHandler;
 let Route = Router.Route;
+let es;
 
 let App = React.createClass({
     checkForAgreement(worker, agreement, callback) {
@@ -52,15 +53,17 @@ let App = React.createClass({
         }
     },
     workerEnableXfer(agreement) {
-        let es = new EventSource('/stream');
-        es.onmessage = function(event) {
-            console.log(event);
-            let data = JSON.parse(event.data);
-            if (data.type === 'finished') {
-                console.log("Docker port to contract: ", data.port);
-                EthClient.contract.setWorkerPort(data.port);
-            }
-        };
+        if (!es) {
+            es = new EventSource('/stream');
+            es.onmessage = function(event) {
+                console.log(event);
+                let data = JSON.parse(event.data);
+                if (data.type === 'finished') {
+                    console.log("Docker port to contract: ", data.port);
+                    EthClient.contract.setWorkerPort(data.port);
+                }
+            };
+        }
         $.post("/receive", {
             port: DockerConfig.port
         }, (data) => {