Review updates

moleculerjs · May 3, 2018 · 35929a3 · icebob · May 3, 2018 · 35929a3
1 parent bbc5d56
commit 35929a3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/context.js b/src/context.js
@@ -77,10 +77,10 @@ class Context {
 	 * @memberof Service
 	 */
 	_trackContext(service) {
-		if ( !service.activeContexts ) {
-			service.activeContexts = [];
+		if ( !service._activeContexts ) {
+			service._activeContexts = [];
 		}
-		service.activeContexts.push(this);
+		service._activeContexts.push(this);
 		this.trackedBy = service;
 	}
 
@@ -93,8 +93,8 @@ class Context {
 	 * @memberof Service
 	 */
 	dispose() {
-		if ( this.trackedBy && this.trackedBy.activeContexts ) {
-			const contextList = this.trackedBy.activeContexts;
+		if ( this.trackedBy && this.trackedBy._activeContexts ) {
+			const contextList = this.trackedBy._activeContexts;
 			const contextIndex = contextList.indexOf(this);
 			if (contextIndex !== -1) {
 				contextList.splice(contextIndex, 1);

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
@@ -100,7 +100,7 @@ class Service {
 					const contextDisposeCatch = (ret) => {
 						return this.Promise.reject(contextDispose(ret));
 					};
-					return innerAction.handler(ctx).then(contextDispose, contextDisposeCatch);
+					return innerAction.handler(ctx).then(contextDispose).catch(contextDisposeCatch);
 				};
 
 			});
@@ -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);
@@ -292,7 +292,7 @@ class Service {
 	 * @memberof Service
 	 */
 	_getActiveContexts() {
-		return this.activeContexts || [];
+		return this._activeContexts || [];
 	}
 
 	/**

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: {