Merge branch 'master' of github.com:actionhero/actionhero

actionhero · Feb 21, 2018 · 5be607f · 5be607f
2 parents 936d47c + 0edda42
commit 5be607f
Show file tree

Hide file tree

Showing 8 changed files with 693 additions and 637 deletions.
diff --git a/bin/methods/start/lib/actionheroCluster.js b/bin/methods/start/lib/actionheroCluster.js
@@ -226,20 +226,20 @@ module.exports = class ActionHeroCluster {
     })
 
     if (
-        this.options.expectedWorkers < this.workers.length &&
+      this.options.expectedWorkers < this.workers.length &&
         this.workers.length >= 1 &&
         !stateCounts.stopping &&
         !stateCounts.stopped &&
         !stateCounts.restarting
-      ) {
+    ) {
       worker = this.workers[(this.workers.length - 1)]
       this.log('signaling worker #' + worker.id + ' to stop', 'info')
       worker.stop()
     } else if (
-        (this.options.expectedWorkers > this.workers.length) &&
+      (this.options.expectedWorkers > this.workers.length) &&
         !stateCounts.starting &&
         !stateCounts.restarting
-      ) {
+    ) {
       workerId = 1
       this.workers.forEach((w) => {
         if (w.id === workerId) { workerId++ }

diff --git a/classes/server.js b/classes/server.js
@@ -166,7 +166,7 @@ module.exports = class MyServer extends Server {
     [
       'start',
       'stop',
-      'sendFile',    // connection, error, fileStream, mime, length, lastModified
+      'sendFile', // connection, error, fileStream, mime, length, lastModified
       'sendMessage', // connection, message
       'goodbye'
     ].forEach((method) => {

diff --git a/config/tasks.js b/config/tasks.js
@@ -8,7 +8,7 @@ exports['default'] = {
       // Logging levels of task workers
       workerLogging: {
         failure: 'error', // task failure
-        success: 'info',  // task success
+        success: 'info', // task success
         start: 'info',
         end: 'info',
         cleaning_worker: 'info',

diff --git a/initializers/redis.js b/initializers/redis.js
@@ -105,7 +105,7 @@ await api.redis.publish(payload)
         requestId: requestId,
         method: method,
         connectionId: connectionId,
-        args: args   // [1,2,3]
+        args: args // [1,2,3]
       }
 
       await api.redis.publish(payload)