Merge pull request #628 from joola/feature/#627

#627 added support for beacon insert wait
joola · Nov 11, 2014 · 55eba1c · 55eba1c
2 parents f535a31 + cb00081
commit 55eba1c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/config/default.yml b/config/default.yml
@@ -1,4 +1,4 @@
-version: 0.1.5
+version: 0.1.8
 interfaces:
   webserver:
     enabled: true
@@ -67,6 +67,8 @@ store:
     mongodb:
       dsn: mongodb://localhost:27017/cache
       expireafterseconds: 0
+beacon:
+  wait: true
 dispatch:
   enabled: true
   expires: 60

diff --git a/lib/dispatch/beacon.js b/lib/dispatch/beacon.js
@@ -140,7 +140,7 @@ exports.insert = {
   description: "",
   inputs: {
     required: ['workspace', 'collection', 'document'],
-    optional: [ 'options']
+    optional: ['options']
   },
   _outputExample: {},
   _permission: ['beacon:insert'],
@@ -156,6 +156,16 @@ exports.insert = {
       _params.workspace = req.user.workspace;
     _params.collection = req.parsed.collection;
     _params.document = req.parsed.document || req.parsed.payload;
+
+
+    var w = joola.config.get('beacon').hasOwnProperty('wait') ? joola.config.get('beacon:wait') : false;
+    if (!req.parsed.options)
+      req.parsed.options = {
+        wait: w
+      };
+    else if (!req.parsed.options.hasOwnProperty('wait'))
+      req.parsed.options.wait = w;
+
     if (typeof _params.document === 'string') {
       try {
         _params.document = JSON.parse(_params.document);
@@ -183,10 +193,14 @@ exports.insert = {
         return router.responseSuccess(result, headers, req, res);
       };
       if (joola.dispatch.enabled)
-        joola.dispatch.request(_token._ || _token, 'beacon:insert', _params, cb);
+        joola.dispatch.request(_token._ || _token, 'beacon:insert', _params, req.parsed.options.wait ? cb : function () {
+        });
       else
-        exports.insert.run.apply(this, [context, _params.workspace, _params.collection, _params.document, _params.options, cb]);
-
+        exports.insert.run.apply(this, [context, _params.workspace, _params.collection, _params.document, _params.options, req.parsed.options.wait ? cb : function () {
+        }]);
+      if (!req.parsed.options.wait) {
+        cb(null, _params.document, {});
+      }
     }
     catch (ex) {
       return router.responseError(500, new router.ErrorTemplate(ex), req, res);