Merge pull request #26 from signalive/deniz

Deniz
signalive · Aug 16, 2017 · e70a2e1 · e70a2e1
2 parents bc3325c + d1357c5
commit e70a2e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "microservice-kit",
-  "version": "0.3.14",
+  "version": "0.4.0",
   "description": "Utility belt for building microservices",
   "main": "src/index.js",
   "scripts": {

diff --git a/src/lib/exchange.js b/src/lib/exchange.js
@@ -69,6 +69,10 @@ class Exchange {
         options.correlationId = uuid();
         options.replyTo = this.rpc_.getUniqueQueueName();
 
+        if (_.isNumber(options.timeout) && options.timeout > 0) {
+            options.expiration = options.timeout.toString();
+        }
+
         const rv = new Promise((resolve, reject) => {
             this.log_('info', 'Publishing event', {
                 eventName,

diff --git a/src/lib/queue.js b/src/lib/queue.js
@@ -190,6 +190,10 @@ class Queue {
         options.correlationId = uuid();
         options.replyTo = this.rpc_.getUniqueQueueName();
 
+        if (_.isNumber(options.timeout) && options.timeout > 0) {
+            options.expiration = options.timeout.toString();
+        }
+
         const rv = new Promise((resolve, reject) => {
             this.log_('info', 'Sending event to queue', {
                 eventName,