Lint fixes

jaredwray · Dec 12, 2014 · 80f2318 · 80f2318
1 parent 46459ff
commit 80f2318
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/lib/caching.js b/lib/caching.js
@@ -47,8 +47,8 @@ var caching = function (args) {
 
         self.queues[key] = [cb];
 
-        function fillCallbacks(err, data){
-            self.queues[key].forEach(function(f){
+        function fillCallbacks(err, data) {
+            self.queues[key].forEach(function(f) {
                 f(err, data);
             });
             delete self.queues[key];
@@ -69,7 +69,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
@@ -54,8 +54,8 @@ var multi_caching = function (caches) {
 
         self.queues[key] = [cb];
 
-        function fillCallbacks(err, data){
-            self.queues[key].forEach(function(f){
+        function fillCallbacks(err, data) {
+            self.queues[key].forEach(function(f) {
                 f(err, data);
             });
             delete self.queues[key];
@@ -77,7 +77,7 @@ var multi_caching = function (caches) {
             } else {
                 work(function (err, data) {
                     if (err) {
-                        fillCallbacks(err, data);
+                        fillCallbacks(err, null);
                         return;
                     }
                     var opts = {
@@ -86,7 +86,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);
+                        }
                     });
                 });
             }