not to expose membership functions

esatterwhite · Jul 30, 2015 · eb69f2c · eb69f2c
1 parent 1c37d2e
commit eb69f2c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/benchmarks/convergence-time/worker.js b/benchmarks/convergence-time/worker.js
@@ -24,6 +24,8 @@ var program = require('commander');
 var TChannel = require('tchannel');
 
 var Swim = require('../../');
+var leaveHandler = require('../../server/admin-leave-handler');
+var joinHandler = require('../../server/admin-join-handler');
 
 if (require.main === module) {
     parseArgs();
@@ -67,7 +69,7 @@ function handleMessage(swim) {
                 });
                 break;
             case 'join':
-                swim.adminJoin(function onAdminJoin(err) {
+                join(swim, function onJoin(err) {
                     if (err) {
                         console.error(err);
                         process.exit(1);
@@ -81,10 +83,10 @@ function handleMessage(swim) {
                 });
                 break;
             case 'leave':
-                swim.adminLeave(function onLeave() {});
+                leave(swim, function onLeave() {});
                 break;
             case 'shutdown':
-                swim.adminLeave(function onLeave() {});
+                leave(swim, function onLeave() {});
                 process.removeListener('message', onMessage);
                 process.exit();
                 break;
@@ -131,3 +133,15 @@ function bootstrap(callback) {
 
     swim.channel.listen(Number(port), host);
 }
+
+function join(swim, callback) {
+    joinHandler({
+        ringpop: swim
+    }, callback);
+}
+
+function leave(swim, callback) {
+    leaveHandler({
+        ringpop: swim
+    }, callback);
+}
diff --git a/index.js b/index.js
@@ -48,8 +48,6 @@ var rawHead = require('./lib/request-proxy/util.js').rawHead;
 var RequestProxy = require('./lib/request-proxy/index.js');
 var safeParse = require('./lib/util').safeParse;
 var sendJoin = require('./lib/swim/join-sender.js').joinCluster;
-var adminLeaveHandler = require('./server/admin-leave-handler.js');
-var adminJoinHandler = require('./server/admin-join-handler.js');
 
 var HOST_PORT_PATTERN = /^(\d+.\d+.\d+.\d+):\d+$/;
 var MAX_JOIN_DURATION = 300000;
@@ -192,18 +190,6 @@ RingPop.prototype.setupChannel = function setupChannel() {
     createServer(this, this.channel);
 };
 
-RingPop.prototype.adminJoin = function adminJoin(callback) {
-    adminJoinHandler({
-        ringpop: this
-    }, callback);
-};
-
-RingPop.prototype.adminLeave = function adminLeave(callback) {
-    adminLeaveHandler({
-        ringpop: this
-    }, callback);
-};
-
 /*
  * opts are:
  *   - bootstrapFile: File or array used to seed join process