use enhanced event emitter

sagiegurari · Jan 7, 2017 · 418e2a8 · 418e2a8
1 parent e3f836b
commit 418e2a8
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -140,7 +140,7 @@ See [contributing guide](.github/CONTRIBUTING.md)
 
 | Date        | Version | Description |
 | ----------- | ------- | ----------- |
-| 2016-12-31  | v1.0.25 | Maintenance |
+| 2017-01-07  | v1.0.26 | Maintenance |
 | 2015-10-22  | v0.0.16 | Timeout child commands (see childCommandTimeout option) |
 | 2015-10-16  | v0.0.12 | Maintenance |
 | 2015-09-23  | v0.0.7  | Upgrade to redis 2.0 |

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,6 +1,6 @@
 | Date        | Version | Description |
 | ----------- | ------- | ----------- |
-| 2016-12-31  | v1.0.25 | Maintenance |
+| 2017-01-07  | v1.0.26 | Maintenance |
 | 2015-10-22  | v0.0.16 | Timeout child commands (see childCommandTimeout option) |
 | 2015-10-16  | v0.0.12 | Maintenance |
 | 2015-09-23  | v0.0.7  | Upgrade to redis 2.0 |

diff --git a/lib/multiple-redis.js b/lib/multiple-redis.js
@@ -1,8 +1,8 @@
 'use strict';
 
 //load external modules
-var events = require('events');
 var util = require('util');
+var EventEmitterEnhancer = require('event-emitter-enhancer');
 var debug = require('debuglog')('multiple-redis');
 var redis = require('redis');
 var redisCommands = require('redis-commands');
@@ -28,7 +28,7 @@ function MultiRedisClient(params) {
     var self = this;
 
     //call super constructor
-    events.EventEmitter.call(self);
+    EventEmitterEnhancer.EnhancedEventEmitter.call(self);
 
     var options = params.options || {};
     self.childCommandTimeout = options.childCommandTimeout || 10000;
@@ -57,8 +57,8 @@ function MultiRedisClient(params) {
     self.setupStateChangeEvents();
 }
 
-//setup MessageSocket as an event emitter
-util.inherits(MultiRedisClient, events.EventEmitter);
+//setup MultiRedisClient as an event emitter
+util.inherits(MultiRedisClient, EventEmitterEnhancer.EnhancedEventEmitter);
 
 /**
  * True when at least one internal redis client is connected.
@@ -131,9 +131,7 @@ MultiRedisClient.prototype.initClients = function (params, options) {
  * @private
  */
 MultiRedisClient.prototype.setupEventProxy = function () {
-    var self = this;
-
-    [
+    this.proxyEvents(this.clients, [
         'ready',
         'connect',
         'reconnecting',
@@ -148,15 +146,7 @@ MultiRedisClient.prototype.setupEventProxy = function () {
         'psubscribe',
         'unsubscribe',
         'punsubscribe'
-    ].forEach(function createProxy(event) {
-        self.clients.forEach(function onClientEvent(client) {
-            client.on(event, function onEvent() {
-                var argumentsArray = Array.prototype.slice.call(arguments, 0);
-                argumentsArray.unshift(event);
-                self.emit.apply(self, argumentsArray);
-            });
-        });
-    });
+    ]);
 };
 
 /**
@@ -169,17 +159,13 @@ MultiRedisClient.prototype.setupEventProxy = function () {
 MultiRedisClient.prototype.setupStateChangeEvents = function () {
     var self = this;
 
-    var onStateChange = function () {
-        self.resetState();
-    };
-
-    [
+    self.onAny([
         'connect',
         'ready',
         'error',
         'end'
-    ].forEach(function addListener(eventName) {
-        self.on(eventName, onStateChange);
+    ], function runResetState() {
+        self.resetState();
     });
 };
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "multiple-redis",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "Run redis commands against multiple redis instances.",
   "author": {
     "name": "Sagie Gur-Ari",
@@ -41,12 +41,12 @@
   "dependencies": {
     "async": "^2.1.4",
     "debuglog": "^1.0.1",
+    "event-emitter-enhancer": "latest",
     "redis": "^2.6.3",
     "redis-commands": "^1.3.0"
   },
   "devDependencies": {
     "chai": "latest",
-    "event-emitter-enhancer": "latest",
     "grunt": "latest",
     "grunt-cli": "latest",
     "husky": "latest",

diff --git a/test/spec/multiple-redis-spec.js b/test/spec/multiple-redis-spec.js
@@ -7,7 +7,6 @@ var assert = chai.assert;
 var redis = require('redis');
 var events = require('events');
 var EventEmitter = events.EventEmitter;
-var EventEmitterEnhancer = require('event-emitter-enhancer');
 var MultipleRedis = require('../../');
 
 var noop = function noop() {
@@ -394,8 +393,6 @@ describe('MultipleRedis Tests', function () {
             assert.isFalse(client.connected);
             assert.isNull(client.server_info);
 
-            EventEmitterEnhancer.modifyInstance(client);
-
             var unbind = client.onAsync('connect', function () {
                 assert.isTrue(client.connected);
                 assert.equal(client.server_info, 'server1');