Merge branch 'release/1.2.5'

cubyn · May 29, 2017 · 9c7a164 · 9c7a164
2 parents 0895fb5 + 5935309
commit 9c7a164
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "carotte-amqp",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "AMQP wrapper for the carotte microservice framework",
   "main": "src/index.js",
   "repository": "https://github.com/cubyn/node-carotte-amqp",

diff --git a/src/index.js b/src/index.js
@@ -214,7 +214,10 @@ function Carotte(config) {
         }
 
         options = Object.assign({ headers: {}, context: {} }, options, parseQualifier(qualifier));
-        options.headers['x-destination'] = qualifier;
+
+        if (!config.enableDeadLetter || config.deadLetterQualifier !== qualifier) {
+            options.headers['x-destination'] = qualifier;
+        }
 
         const exchangeName = getExchangeName(options);
         const rpc = options.headers['x-reply-to'] !== undefined;
@@ -462,20 +465,23 @@ function Carotte(config) {
                                 publish: subPublication(context, 'publish').bind(this),
                                 parallel: subPublication(context, 'parallel').bind(this)
                             })
-                            .then(res => {
+                            .then(response => {
                                 const timeNow = new Date().getTime();
                                 autodocAgent.logStats(qualifier, timeNow - startTime, headers['x-origin-service']);
                                 // send back response if needed
-                                return carotte.replyToPublisher(message, res, context);
+                                return carotte.replyToPublisher(message, response, context)
+                                    // forward response down the chain
+                                    .then(() => response);
                             })
-                        .then(() => {
+                        .then(response => {
                             consumerDebug('Handler success');
                             // otherwise internal subscribe (rpc…)
                             if (qualifier) {
                                 config.transport.info(`${rpc ? '◀ ' : '◁ '} ${qualifier}`, {
                                     context,
                                     headers,
                                     data,
+                                    response,
                                     subscriber: qualifier,
                                     destination: '',
                                     executionMs: new Date().getTime() - startTime,