Merge branch 'master' of github.com:twilson63/node-cloudq

app.js

@@ -86,19 +86,23 @@ app.get('/:queue', auth, function (req, res) {
 
       workers[req.params.queue].push(res);
 
-      // listen for timeout
-      setTimeout(function() {
-        res.send(SUCCESS, { status: 'empty'});
-        // dequeue worker...
+      function dequeueResponse () {
         workers[req.params.queue] = _(workers[req.params.queue]).without(res);
+      }
+
+      var responseTimeoutId = setTimeout(function () {
+        log.info({req: req}, 'Queue request timeout');
+        dequeueResponse();
+        res.send(SUCCESS, {status: 'empty'});
       }, TIMEOUT);
-      // req.socket.on('timeout', function() {
-      //   res.send(200, { status: 'empty'});
-      //   // dequeue worker...
-      //   workers[req.params.queue] = _(workers[req.params.queue]).without(res);
-      // });
 
-      return; // res.send(200, { status: 'empty'});
+      res.once('close', function () {
+        log.info({req: req}, 'Queue request terminated');
+        clearTimeout(responseTimeoutId);
+        dequeueResponse();
+      });
+
+      return;
     }
 
     // have jobs so pass first one to resp worker...
@@ -140,10 +144,7 @@ function logger () {
     }
 
     res.once('finish', logRequest);
-    res.once  ('close', function () {
-      delete workers[req.params.queue];
-      logRequest();
-    });
+    res.once('close', logRequest);
 
     next();
   };