Merge 62b8048 into d4569d1

jpwilliams · Jan 29, 2018 · 9588a37 · 9588a37
2 parents d4569d1 + 62b8048
commit 9588a37
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/Request.js b/lib/Request.js
@@ -107,6 +107,12 @@ class Request extends CallableInstance {
       message.priority = parsedOptions.priority
     }
 
+    let timeout = 30000
+    let givenTimeout = Number(parsedOptions.timeout)
+    if (!isNaN(givenTimeout)) timeout = givenTimeout
+
+    if (timeout) message.expiration = timeout
+
     let parsedData
     let eventData = data
 
@@ -136,10 +142,6 @@ class Request extends CallableInstance {
 
     this._emitter.emit('sent', event)
 
-    let timeout = 30000
-    let givenTimeout = Number(parsedOptions.timeout)
-    if (!isNaN(givenTimeout)) timeout = givenTimeout
-
     if (timeout) {
       this._setTimer(messageId, timeout, event)
     }

diff --git a/test/request.test.js b/test/request.test.js
@@ -142,6 +142,7 @@ describe('Request', function () {
     })
 
     it('should return fallback if timing out and fallback set')
+    it('should expire from queue after same time as timeout')
     it('should send NULL if given unparsable data')
   })
 })