Avoid listener to own class's event emitters

sj26 · Apr 16, 2011 · b2de72f · b2de72f
1 parent c9f0639
commit b2de72f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/lib/process.js b/lib/process.js
diff --git a/src/process.coffee b/src/process.coffee
@@ -89,9 +89,6 @@ exports.Process = class Process extends EventEmitter
     else
       raiseConfigError()
 
-    @on 'ready', ->
-      self._processConnections()
-
     @on 'error', (error) ->
       callback = self._activeConnection
       self._activeConnection = null
@@ -101,10 +98,6 @@ exports.Process = class Process extends EventEmitter
       else if self.listeners('error').length <= 1
         throw error
 
-    # Push back the idle time everytime a request is handled
-    @on 'busy', ->
-      self.deferTimeout()
-
   spawn: (callback) ->
     return if @state
 
@@ -142,6 +135,7 @@ exports.Process = class Process extends EventEmitter
     @heartbeat.on 'data', (data) =>
       if "#{@child.pid}\n" is data.toString()
         @changeState 'ready'
+        @_processConnections()
       else
         try
           exception   = JSON.parse data
@@ -229,16 +223,19 @@ exports.Process = class Process extends EventEmitter
       @_activeConnection = @_connectionQueue.shift()
 
     if @_activeConnection and @state is 'ready'
+      # Push back the idle time everytime a request is handled
+      @deferTimeout()
+
       @changeState 'busy'
 
       connection = client.createConnection @sockPath
 
-      @_activeConnection null, connection
-
       connection.on 'close', ->
         self._activeConnection = null
         self.changeState 'ready'
+        self._processConnections()
 
+      @_activeConnection null, connection
     else
       @spawn()
 

diff --git a/test/test_process.coffee b/test/test_process.coffee
@@ -103,7 +103,7 @@ exports.testCreateMultipleConnections = (test) ->
       test.ifError err
 
       openConnections++
-      client.on 'close', -> openConnections--
+      client.on 'end', -> openConnections--
       test.same 1, openConnections
 
       test.ok client