...

hemerajs · Oct 2, 2017 · c0768b3 · c0768b3
1 parent ebc4163
commit c0768b3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/examples/databases/redis-cache.js b/examples/databases/redis-cache.js
@@ -23,7 +23,7 @@ hemera.ready(() => {
       key: 'foo',
       value: 'bar'
     },
-    function (err, resp) {
+    function(err, resp) {
       this.log.info(resp, 'Result')
 
       hemera.act(
@@ -32,7 +32,7 @@ hemera.ready(() => {
           cmd: 'get',
           key: 'foo'
         },
-        function (err, resp) {
+        function(err, resp) {
           this.log.info(resp, 'Result')
         }
       )

diff --git a/packages/hemera-mongo-store/test/utils.js b/packages/hemera-mongo-store/test/utils.js
@@ -45,7 +45,7 @@ function initServer(topic, testCollection, pluginOptions, cb) {
   const server = HemeraTestsuite.start_server(PORT, flags, () => {
     const nats = Nats.connect(authUrl)
     const hemera = new Hemera(nats, {
-      logLevel: 'info'
+      logLevel: 'silent'
     })
     hemera.use(HemeraJoi)
     hemera.use(HemeraMongoStore, pluginOptions)

diff --git a/packages/hemera-redis-cache/README.md b/packages/hemera-redis-cache/README.md
@@ -43,5 +43,10 @@ hemera.ready(() => {
 })
 ```
 
+## Run Redis
+```bash
+$ docker-compose up
+```
+
 ## Dependencies
 - hemera-joi
diff --git a/packages/hemera-redis-cache/docker-compose.yml b/packages/hemera-redis-cache/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '2'
+services:
+  redis:
+    image: redis:alpine
+    ports:
+      - "6379:6379"
diff --git a/packages/hemera/lib/index.js b/packages/hemera/lib/index.js
@@ -1103,6 +1103,7 @@ class Hemera extends EventEmitter {
     hemera._isServer = false
     hemera._execute = null
     hemera._defer = pDefer()
+    hemera._isPromisable = false
     hemera._actCallback = null
 
     // topic is needed to subscribe on a subject in NATS
@@ -1133,12 +1134,7 @@ class Hemera extends EventEmitter {
           .catch(hemera._defer.reject)
       } else if (hemera._actCallback) {
         const res = hemera._actCallback(err, result)
-
-        if (res instanceof Error) {
-          hemera._defer.reject(res)
-        } else {
-          hemera._defer.resolve(res)
-        }
+        hemera._defer.resolve(res)
       } else {
         if (err) {
           hemera._defer.reject(err)