Merge pull request #550 from noobaa/eran_alpha_tcp

TCP mode
noobaa · Oct 13, 2015 · 53382fb · 53382fb
2 parents 84e8639 + b86d71d
commit 53382fb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/client/nb_nodes.js b/src/client/nb_nodes.js
@@ -190,7 +190,9 @@ nb_api.factory('nbNodes', [
                 tier: 'nodes',
                 prod: true,
                 bucket: 'files',
-                root_path: './agent_storage/'
+                root_path: './agent_storage/',
+                port: 8888,
+                secure_port: 9999
             };
 
             config_json.address = 'wss://noobaa.local:' + nbSystem.system.ssl_port;

diff --git a/src/deploy/NVA_build/env.orig b/src/deploy/NVA_build/env.orig
@@ -5,6 +5,8 @@ PORT=8080
 SSL_PORT=8443
 ON_PREMISE=true
 
+AGENTS_OVER_WS=true
+
 # address means the address of the server as reachable from the internet
 ADDRESS=http://localhost
 COOKIE_SECRET=iwqhofbq27ew5jbJb3cq87bukgyaw3or8

diff --git a/src/server/web_server.js b/src/server/web_server.js
@@ -42,19 +42,20 @@ console.log('loading .env file ( no foreman ;)');
 dotenv.load();
 
 
-var numCPUs = Math.ceil(require('os').cpus().length / 2);
-if (cluster.isMaster) {
-    // Fork MD Servers
-    for (var i = 0; i < numCPUs; i++) {
-        console.warn('Spawning MD Server', i + 1);
-        cluster.fork();
-    }
-
-    cluster.on('exit', function(worker, code, signal) {
-        console.log('MD Server ' + worker.process.pid + ' died');
-    });
-    return;
-}
+// Temporary removed - causes issues with upgrade.
+//var numCPUs = Math.ceil(require('os').cpus().length / 2);
+// if (cluster.isMaster) {
+//     // Fork MD Servers
+//     for (var i = 0; i < numCPUs; i++) {
+//         console.warn('Spawning MD Server', i + 1);
+//         cluster.fork();
+//     }
+//
+//     cluster.on('exit', function(worker, code, signal) {
+//         console.log('MD Server ' + worker.process.pid + ' died');
+//     });
+//     return;
+// }
 
 dbg.set_process_name('WebServer');