fix broker option name prefix

moleculerjs · May 3, 2018 · ad9cb20 · ad9cb20
1 parent fb1dffa
commit ad9cb20
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/service-broker.js b/src/service-broker.js
@@ -46,7 +46,7 @@ const defaultOptions = {
 	heartbeatTimeout: 15,
 
 	trackContext: false,
-	$gracefulStopTimeout: 2000,
+	gracefulStopTimeout: 2000,
 
 	disableBalancer: false,
 

diff --git a/src/service.js b/src/service.js
@@ -205,7 +205,7 @@ class Service {
 
 		this.stopped = () => {
 			return new this.Promise((resolve, reject) => {
-				const timeout = setTimeout(reject, this.settings.$gracefulStopTimeout || this.broker.options.$gracefulStopTimeout);
+				const timeout = setTimeout(reject, this.settings.$gracefulStopTimeout || this.broker.options.gracefulStopTimeout);
 				const checkForContexts = () => {
 					if (this._getActiveContexts().length === 0) {
 						clearTimeout(timeout);

diff --git a/test/integration/service.lifecycle.spec.js b/test/integration/service.lifecycle.spec.js
@@ -1,4 +1,5 @@
-let ServiceBroker = require("../../src/service-broker");
+const ServiceBroker = require("../../src/service-broker");
+const { protectReject } = require("../unit/utils");
 
 describe("Test Service handlers", () => {
 
@@ -107,7 +108,6 @@ describe("Test Service handlerswith delayed shutdown", () => {
 		const service = broker.createService(schema);
 		service.schema.actions.test.mockResolvedValue(service.Promise.delay(80));
 		const getActiveContextsSpy = jest.spyOn(service, "_getActiveContexts");
-		// const trackContextsSpy = jest.spyOn(service, "_trackContext");
 		return broker.start()
 			.then(() => {
 				broker.call("delayed.test", {});
@@ -120,6 +120,6 @@ describe("Test Service handlerswith delayed shutdown", () => {
 
 				getActiveContextsSpy.mockReset();
 				getActiveContextsSpy.mockRestore();
-			});
+			}).catch(protectReject);
 	});
 });
diff --git a/test/unit/service-broker.spec.js b/test/unit/service-broker.spec.js
@@ -116,7 +116,7 @@ describe("Test ServiceBroker constructor", () => {
 			heartbeatTimeout : 20,
 			heartbeatInterval: 5,
 			trackContext: false,
-			$gracefulStopTimeout: 2000,
+			gracefulStopTimeout: 2000,
 
 			disableBalancer: true,
 			registry: {