Merge branch 'master' into pr/255

moleculerjs · May 3, 2018 · fb1dffa · fb1dffa
2 parents 35929a3 + 5040a2e
commit fb1dffa
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/context.js b/src/context.js
@@ -239,7 +239,9 @@ class Context {
 			if (distTimeout <= 0) {
 				return Promise.reject(new RequestSkippedError(actionName, this.broker.nodeID));
 			}
-			opts.timeout = distTimeout;
+
+			if (!opts.timeout || distTimeout < opts.timeout)
+				opts.timeout = distTimeout;
 		}
 
 		// Max calling level check to avoid calling loops