Run wrap callback function in original domain

jaredwray · Dec 18, 2014 · 7bd7e9e · 7bd7e9e
1 parent 812c353
commit 7bd7e9e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/lib/caching.js b/lib/caching.js
@@ -43,15 +43,16 @@ var caching = function (args) {
         }
 
         if (self.queues[key]) {
-            self.queues[key].push(cb);
+            self.queues[key].push({cb: cb, domain: process.domain});
             return;
         }
 
-        self.queues[key] = [cb];
+        self.queues[key] = [{cb: cb, domain: process.domain}];
 
-        function fillCallbacks(err, data){
-            self.queues[key].forEach(function(f){
-                f(err, data);
+        function fillCallbacks(err, data) {
+            self.queues[key].forEach(function(task) {
+                var taskDomain = task.domain || domain.create();
+                taskDomain.bind(task.cb)(err, data);
             });
             delete self.queues[key];
         }
@@ -64,7 +65,7 @@ var caching = function (args) {
             } else {
                 domain
                 .create()
-                .on('error', function(err){
+                .on('error', function(err) {
                     fillCallbacks(err);
                 })
                 .bind(work)(function (err, data) {
@@ -76,7 +77,7 @@ var caching = function (args) {
                         if (err && (!self.ignoreCacheErrors)) {
                             fillCallbacks(err);
                         } else {
-                            fillCallbacks(err, data);
+                            fillCallbacks(null, data);
                         }
                     });
                 });

diff --git a/lib/multi_caching.js b/lib/multi_caching.js
@@ -49,15 +49,16 @@ var multi_caching = function (caches) {
         }
 
         if (self.queues[key]) {
-            self.queues[key].push(cb);
+            self.queues[key].push({cb: cb, domain: process.domain});
             return;
         }
 
-        self.queues[key] = [cb];
+        self.queues[key] = [{cb: cb, domain: process.domain}];
 
-        function fillCallbacks(err, data){
-            self.queues[key].forEach(function(f){
-                f(err, data);
+        function fillCallbacks(err, data) {
+            self.queues[key].forEach(function(task) {
+                var taskDomain = task.domain || domain.create();
+                taskDomain.bind(task.cb)(err, data);
             });
             delete self.queues[key];
         }
@@ -78,12 +79,12 @@ var multi_caching = function (caches) {
             } else {
                 domain
                 .create()
-                .on('error', function(err){
+                .on('error', function(err) {
                     fillCallbacks(err);
                 })
                 .bind(work)(function (err, data) {
                     if (err) {
-                        fillCallbacks(err, data);
+                        fillCallbacks(err);
                         return;
                     }
                     var opts = {
@@ -92,7 +93,11 @@ var multi_caching = function (caches) {
                         ttl: ttl
                     };
                     set_in_multiple_caches(caches, opts, function (err) {
-                        fillCallbacks(null, data);
+                        if (err) {
+                            fillCallbacks(err);
+                        } else {
+                            fillCallbacks(null, data);
+                        }
                     });
                 });
             }