flatten => things

nomilous · Oct 31, 2016 · be74d34 · be74d34
1 parent 7e0bbc4
commit be74d34
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/lib/Cluster.js b/lib/Cluster.js
@@ -31,9 +31,7 @@ class Cluster extends EventEmitter {
 
     Object.defineProperty(this, '_masterName', {value: null, writable: true});
     Object.defineProperty(this, '_master', {
-      get: () => {
-        return this._masterName == this._vertex.name;
-      }
+      get: () => this._masterName == this._vertex.name
     });
 
     Object.defineProperty(this, '_waitingMaster', {value: []});
@@ -42,10 +40,7 @@ class Cluster extends EventEmitter {
     Object.defineProperty(this, '_members', {value: {}});
     Object.defineProperty(this, '_waitingReady', {value: null, writable: true});
     Object.defineProperty(this, '_ready', {
-      get: () => {
-        return Object.keys(this._members).length == Object.keys(this.members).length
-          && this._stores._ready;
-      },
+      get: () => this.getMemberCount(true) == this.getMemberCount(false) && this._stores._ready,
       enumerable: false
     });
 
@@ -182,9 +177,7 @@ class Cluster extends EventEmitter {
     return new Promise((resolve, reject) => {
       let attempts = Object.keys(this.config.join)
         .filter(isInt)
-        .map(key => {
-          return this.config.join[key]
-        })
+        .map(key => this.config.join[key])
         .filter(isntSelf(
           this._vertex.server._server.address()
         ));
@@ -324,9 +317,7 @@ class Cluster extends EventEmitter {
 
     reply('join2', new Promise((resolve, reject) => {
       this._memberStore.set(data.name, data)
-        .then(result => {
-          resolve();
-        })
+        .then(result => resolve())
         .catch(reject)
     }));
   }

diff --git a/lib/Member.js b/lib/Member.js
@@ -20,9 +20,7 @@ class Member {
 
     var usrSocket;
     Object.defineProperty(this, 'socket', {
-      get: () => {
-        return usrSocket;
-      },
+      get: () => usrSocket,
       set: (socket) => {
         usrSocket = socket;
         Object.defineProperty(usrSocket, 'member', {
@@ -54,9 +52,7 @@ class Member {
 
     var sysSocket;
     Object.defineProperty(this, '_sys', {
-      get: () => {
-        return sysSocket;
-      },
+      get: () => sysSocket,
       set: (socket) => {
         sysSocket = socket;
         Object.defineProperty(sysSocket, 'member', {
@@ -74,9 +70,7 @@ class Member {
 
     let joined = false;
     Object.defineProperty(this, '_stopped', {
-      get: () => {
-        return joined;
-      },
+      get: () => joined,
       set: (value) => {
         joined = value;
         this._updated(this);

diff --git a/lib/Server.js b/lib/Server.js
@@ -20,10 +20,7 @@ class Server {
 
     let nextSession = 0;
     Object.defineProperty(this, '_nextSession', {
-      get: () => {
-        // TODO: wrap
-        return nextSession++;
-      }
+      get: () => nextSession++ // TODO: wrap
     });
 
     this._defaults();
@@ -174,9 +171,7 @@ class Server {
     this._sessions[id] = session;
     session.contexts = {};
     Object.defineProperty(session, 'socket', {
-      get: () => {
-        return socket;
-      },
+      get: () => socket,
       enumerable: true
     });
     return session;
@@ -196,9 +191,7 @@ class Server {
     }
     session.contexts[handler] = {local: {}};
     Object.defineProperty(session.contexts[handler], 'socket', {
-      get: () => {
-        return session.socket;
-      },
+      get: () => session.socket,
       enumerable: true
     });
   }
@@ -271,7 +264,6 @@ class Server {
     }
   }
 
-
 }
 
 module.exports = Server;