Merge pull request #186 from matiu/bug/ssl-sockets

Bug/ssl sockets

bws.js

@@ -5,14 +5,17 @@ var fs = require('fs');
 var ExpressApp = require('./lib/expressapp');
 var WsApp = require('./lib/wsapp');
 var config = require('./config');
+var sticky = require('sticky-session');
+
 
 var port = process.env.BWS_PORT || config.port || 3232;
 
 var cluster = require('cluster');
 var http = require('http');
 var numCPUs = require('os').cpus().length;
-
+var clusterInstances = config.clusterInstances || numCPUs;
 var serverModule = config.https ? require('https') : require('http');
+
 var serverOpts = {};
 
 if (config.https) {
@@ -20,31 +23,29 @@ if (config.https) {
   serverOpts.cert = fs.readFileSync(config.certificateFile || './ssl/certificate.pem');
 }
 
-var startOne = function() {
+var start = function() {
   var app = ExpressApp.start(config);
-  var server = config.https ? serverModule.createServer(serverOpts, app) :
+  var server;
-    serverModule.Server(app);
+
-  var ws = WsApp.start(server, config);
+  if (config.cluster) {
-  server.listen(port);
+    server = sticky(clusterInstances, function() {
-  console.log('Bitcore Wallet Service running on port ' + port);
+      var server = config.https ? serverModule.createServer(serverOpts, app) :
-};
+        serverModule.Server(app);
-
+      WsApp.start(server, config);
-if (!config.cluster) {
+      return server;
-  startOne();
-} else {
-  if (!config.storageOpts.multiLevel || !config.lockOpts.lockerServer)
-    throw 'When running in cluster mode, multilevel and locker server need to be configured';
-
-  var clusterInstances = config.clusterInstances || numCpus;
-
-  if (cluster.isMaster) {
-    for (var i = 0; i < clusterInstances; i++) {
-      cluster.fork();
-    }
-    cluster.on('exit', function(worker, code, signal) {
-      console.log('worker ' + worker.process.pid + ' died');
     });
   } else {
-    startOne();
+    server = config.https ? serverModule.createServer(serverOpts, app) :
+      serverModule.Server(app);
+    WsApp.start(server, config);
   }
-}
+  server.listen(port, function(err) {
+    if (err) console.log('ERROR: ', err);
+    console.log('Bitcore Wallet Service running on port ' + port);
+  });
+};
+
+if (config.cluster && (!config.storageOpts.multiLevel || !config.lockOpts.lockerServer))
+  throw 'When running in cluster mode, multilevel and locker server need to be configured';
+
+start();

config.js

@@ -3,27 +3,28 @@ var config = {
   disableLogs: false,
   port: 3232, 
   // Uncomment to make BWS a forking server
-  cluster: true,
+  // cluster: true,
   // Uncomment to use the nr of availalbe CPUs
-  clusterInstances: 4,
+  // clusterInstances: 4,
 
   // https: true,
   // privateKeyFile: 'private.pem',
   // certificateFile: 'cert.pem',
 
   storageOpts: {
-    // dbPath: './db',
+    dbPath: './db',
-    multiLevel: {
+    // Uncomment to use multilevel server
-      host: 'localhost',
+     // multiLevel: {
-      port: 3230,
+     //   host: 'localhost',
-    },
+     //   port: 3230,
+     // },
   },
   lockOpts: {
     //  To use locker-server, uncomment this:
-    lockerServer: {
+     // lockerServer: {
-      host: 'localhost',
+     //   host: 'localhost',
-      port: 3231,
+     //   port: 3231,
-    },
+     // },
   },
   blockchainExplorerOpts: {
     livenet: {

package.json

@@ -2,7 +2,7 @@
   "name": "bitcore-wallet-service",
   "description": "A service for Mutisig HD Bitcoin Wallets",
   "author": "BitPay Inc",
-  "version": "0.0.25",
+  "version": "0.0.26",
   "keywords": [
     "bitcoin",
     "copay",
@@ -41,6 +41,7 @@
     "sjcl": "^1.0.2",
     "socket.io": "^1.3.5",
     "socket.io-client": "^1.3.5",
+    "sticky-session": "^0.1.0",
     "uuid": "*"
   },
   "devDependencies": {
@@ -58,11 +59,14 @@
     "test": "./node_modules/.bin/mocha",
     "coveralls": "./node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
   },
-  "contributors": [{
+  "contributors": [
-    "name": "Ivan Socolsky",
+    {
-    "email": "ivan@bitpay.com"
+      "name": "Ivan Socolsky",
-  }, {
+      "email": "ivan@bitpay.com"
-    "name": "Matias Alejo Garcia",
+    },
-    "email": "ematiu@gmail.com"
+    {
-  }]
+      "name": "Matias Alejo Garcia",
+      "email": "ematiu@gmail.com"
+    }
+  ]
 }