Renamed initWorkerClusterController to just workerClusterControllerPath

Author: jondubois

index.js

@@ -109,7 +109,7 @@ SocketCluster.prototype._init = function (options) {
     brokerController: null,
     brokerConnectRetryErrorThreshold: null,
     initController: null,
-    initWorkerClusterController: null,
+    workerClusterController: null,
     rebootOnSignal: true,
     downgradeToUser: false,
     path: '/socketcluster/',
@@ -183,10 +183,10 @@ SocketCluster.prototype._init = function (options) {
       self._paths.appInitControllerPath = null;
   }
 
-  if (self.options.initWorkerClusterController) {
-    self._paths.appInitWorkerClusterControllerPath = path.resolve(self.options.initWorkerClusterController);
+  if (self.options.workerClusterController) {
+    self._paths.appWorkerClusterControllerPath = path.resolve(self.options.workerClusterController);
   } else {
-    self._paths.appInitWorkerClusterControllerPath = null;
+    self._paths.appWorkerClusterControllerPath = null;
   }
 
   if (/\.js$/.test(self.options.wsEngine)) {

lib/workercluster.js

@@ -46,9 +46,9 @@ if (cluster.isMaster) {
       }
 
       // Run an initController to initialize anything for the master process of all SCWorkers
-      if (m.data.paths.appInitWorkerClusterControllerPath != null) {
-        var _initWorkerClusterController = require(m.data.paths.appInitWorkerClusterControllerPath);
-        _initWorkerClusterController.run();
+      if (m.data.paths.appWorkerClusterControllerPath != null) {
+        var initWorkerClusterController = require(m.data.paths.appWorkerClusterControllerPath);
+        initWorkerClusterController.run(process);
       }
 
       var workerCount = m.data.workerCount;

sample/server.js

@@ -8,7 +8,7 @@ var SocketCluster = require('socketcluster').SocketCluster;
 var workerControllerPath = argv.wc || process.env.SOCKETCLUSTER_WORKER_CONTROLLER;
 var brokerControllerPath = argv.bc || process.env.SOCKETCLUSTER_BROKER_CONTROLLER;
 var initControllerPath = argv.ic || process.env.SOCKETCLUSTER_INIT_CONTROLLER;
-var initWorkerClusterControllerPath = argv.iwc || process.env.SOCKETCLUSTER_INIT_WORKERCLUSTER_CONTROLLER;
+var workerClusterControllerPath = argv.wcc || process.env.SOCKETCLUSTER_WORKERCLUSTER_CONTROLLER;
 var environment = process.env.ENV || 'dev';
 
 var options = {
@@ -21,7 +21,7 @@ var options = {
   workerController: workerControllerPath || __dirname + '/worker.js',
   brokerController: brokerControllerPath || __dirname + '/broker.js',
   initController: initControllerPath || null,
-  initWorkerClusterController: initWorkerClusterControllerPath || null,
+  workerClusterController: workerClusterControllerPath || null,
   socketChannelLimit: Number(process.env.SOCKETCLUSTER_SOCKET_CHANNEL_LIMIT) || 1000,
   clusterStateServerHost: argv.cssh || process.env.SCC_STATE_SERVER_HOST || null,
   clusterStateServerPort: process.env.SCC_STATE_SERVER_PORT || null,