remove long poll

Author: Amoki

lib/handlers/hydrater.js

@@ -21,32 +21,20 @@ module.exports = function(req, res, server, logger, next) {
     return next(new restify.MissingParameterError('No specified callback'));
   }
 
+  res.send(202);
+  next();
+
   // Prepare the new task
   var task = {};
   task.file_path = (req.params.file_path) ? req.params.file_path : null;
   task.callback = req.params.callback;
 
-  if(req.params.long_poll) {
-    task.res = res;
-    task.next = next;
-    task.long_poll = true;
-  }
-  else {
-    res.send(202);
-    next();
-  }
 
   task.document = req.params.document || {};
   task.document.metadata = task.document ? task.document.metadata || {} : {};
   task.document.data = task.document ? task.document.data || {} : {};
 
-
-  if(req.params.long_poll) {
-    task.priority = 100;
-  }
-  else {
-    task.priority = (req.params.priority) ? parseInt(req.params.priority) : 0;
-  }
+  task.priority = (req.params.priority) ? parseInt(req.params.priority) : 0;
 
   // Push it to the queue
   server.queue.push(task, -task.priority);

lib/helpers/hydrater.js

@@ -9,7 +9,6 @@
 
 var async = require('async');
 var request = require('supertest');
-var restify = require('restify');
 var url = require('url');
 var rarity = require('rarity');
 var util = require('util');
@@ -184,18 +183,12 @@ module.exports = function(hydraterFunction, concurrency, logger, errLogger) {
 
         logger("End of task: " + ((task.file_path) ? task.file_path : task.document.id));
 
-        // When long_polling, it is possible we don't have a callback
-        if(task.callback) {
-          var apiUrl = url.parse(task.callback, false, true);
+        var apiUrl = url.parse(task.callback, false, true);
 
-          request(apiUrl.protocol + "//" + apiUrl.host)
-            .patch(apiUrl.path)
-            .send(changes)
-            .end(rarity.carry([changes], cb));
-        }
-        else {
-          cb(null, changes);
-        }
+        request(apiUrl.protocol + "//" + apiUrl.host)
+          .patch(apiUrl.path)
+          .send(changes)
+          .end(rarity.carry([changes], cb));
       }
     ], function handleErrors(err, changes, res) {
       async.waterfall([
@@ -211,20 +204,7 @@ module.exports = function(hydraterFunction, concurrency, logger, errLogger) {
           cb(null);
         },
         function forwardError(cb) {
-          if(!err) {
-            if(task.long_poll) {
-              task.res.send(changes);
-              task.next();
-            }
-
-            return cb(null);
-          }
-
-          if(task.long_poll) {
-            task.next(new restify.InvalidContentError("ERR hydrating " + ((task.file_path) ? task.file_path : task.document.id) + err.toString()));
-            cb(null);
-          }
-          else {
+          if(err) {
             var apiUrl = url.parse(task.callback, false, true);
 
             request(apiUrl.protocol + "//" + apiUrl.host)
@@ -234,6 +214,9 @@ module.exports = function(hydraterFunction, concurrency, logger, errLogger) {
               })
               .end(cb);
           }
+          else {
+            cb(null);
+          }
         }
       ], function(internalErr) {
         if(internalErr) {

test/errors.js

@@ -51,41 +51,38 @@ describe('Errors', function() {
       };
     });
 
-    it('should be handled gracefully with long_poll option while hydrating', function(done) {
-      request(hydrationServer).post('/hydrate')
-        .send({
-          file_path: 'http://127.0.0.1:4243/afile',
-          callback: 'http://127.0.0.1:4243/result',
-          document: {
-            metadata: {
-              "foo": "bar"
-            },
-          },
-          'long_poll': true
-        })
-        .expect(400)
-        .expect(/err/i)
-        .expect(/buggy/i)
-        .end(done);
-    });
 
     it('should be handled gracefully if file does not exists', function(done) {
       this.timeout(10000);
+
+      var fakeApi = require('./helpers/fake-api.js')();
+      fakeApi.patch('/result', function(req, res, next) {
+        res.send(204);
+        next();
+        if(req.params.hydration_error === 'Error when downloading file http://127.0.0.1:4244/notafile: 404') {
+          done();
+        }
+        else {
+          done(new Error("Should send an error"));
+        }
+        fakeApi.close();
+
+      });
+
+      fakeApi.listen(4244);
+
       request(hydrationServer).post('/hydrate')
         .send({
-          file_path: 'http://127.0.0.1:4243/notafile',
-          callback: 'http://127.0.0.1:4243/result',
+          file_path: 'http://127.0.0.1:4244/notafile',
+          callback: 'http://127.0.0.1:4244/result',
           document: {
             metadata: {
               "foo": "bar"
             },
-          },
-          'long_poll': true
+          }
         })
-        .expect(400)
-        .expect(/err/i)
-        .expect(/downloading file/i)
-        .end(done);
+        .expect(202)
+        .end(function() {});
     });
   });
 

test/index.js

@@ -44,19 +44,6 @@ describe('POST /hydrate', function() {
       .end(done);
   });
 
-  it('should accept request without callback when long_polling', function(done) {
-    request(server).post('/hydrate')
-      .send({
-        'file_path': 'http://127.0.0.1:4243/afile',
-        'long_poll': true,
-        'document': {
-          'metadata': {},
-        }
-      })
-      .expect(200)
-      .end(done);
-  });
-
   it('should immediately return 202', function(done) {
     this.timeout(300);
     request(server)
@@ -71,26 +58,6 @@ describe('POST /hydrate', function() {
       .expect(202)
       .end(done);
   });
-
-  it('should allow for long polling', function(done) {
-    this.timeout(10000);
-
-    request(server)
-      .post('/hydrate')
-      .send({
-        'file_path': 'http://127.0.0.1:4243/afile',
-        'callback': 'http://127.0.0.1:4243/callback',
-        'long_poll': true,
-        'document': {
-          'metadata': {},
-        }
-      })
-      .expect(200)
-      .expect(function(res) {
-        res.body.should.have.property('metadata').and.have.property('hydrated').and.equal(true);
-      })
-      .end(done);
-  });
 });