emit a fatal event instead of exit the process

also try to close the dependency which might started to do some work, like the rulecache

bin/deepstream-start.js

@@ -53,13 +53,13 @@ function action() {
 		// ensure there is no pid file with a running process
 		pidHelper.ensureNotRunning( function( err ) {
 			if ( err ) {
-				return pidHelper.exit( err );
+				return pidHelper.exit( err, true );
 			}
 			const child = child_process.spawn( path.resolve( __dirname, 'deepstream' ), ['start'].concat( args ), {
 				detached: true,
 				stdio: [ 'ignore']
 			} );
-			const WAIT_FOR_ERRORS = 2000;
+			const WAIT_FOR_ERRORS = 3000;
 			// register handler if the child process will fail within WAIT_FOR_ERRORS period
 			child.on( 'close', detachErrorHandler );
 			child.on( 'exit', detachErrorHandler );
@@ -78,6 +78,9 @@ function action() {
 			ds.on( 'started', function() {
 				pidHelper.save( process.pid );
 			} );
+			ds.on( 'fatal', function() {
+				pidHelper.exit(new Error( 'Shutting down deepstream due to a fatal error' ));
+			} );
 			ds.start();
 		} catch ( err ) {
 			console.error( err.toString() );
@@ -91,7 +94,7 @@ function action() {
 }
 
 function detachErrorHandler() {
-	console.error( 'Error during detaching the deepstream process, run without --detach'.red );
+	console.error( 'Error during detaching the deepstream process, see logs or run without --detach'.red );
 	process.exit( 1 );
 }
 

bin/pid-helper.js

@@ -92,14 +92,17 @@ const ensureNotRunning = function( callback ) {
  * @param  {Error} err Optional error object
  * @return {void}
  */
-const exit = function( err ) {
-	if ( err instanceof Error ) {
+const exit = function( err, keepPid ) {
+	const errorCode = err ? 1 : 0
+	if( err instanceof Error ) {
 		console.error ( colors.red( err.toString() ) );
-		process.exit( 1 );
-	} else {
+	}
+	if( !keepPid ) {
 		remove( function() {
-			process.exit( 0 );
+			process.exit( errorCode );
 		} );
+	} else {
+		process.exit( errorCode );
 	}
 };
 

src/deepstream.io.js

@@ -165,9 +165,12 @@ Deepstream.prototype._start = function() {
 	var i,
 		initialiser;
 
+	this.initialisers = []
 	for( i = 0; i < this._plugins.length; i++ ) {
 		initialiser = new DependencyInitialiser( this._options, this._plugins[ i ] );
+		this.initialisers.push(initialiser)
 		initialiser.once( 'ready', this._checkReady.bind( this, this._plugins[ i ], initialiser.getDependency() ) );
+		initialiser.once( 'fatal', this._onFatal.bind(this) );
 	}
 	this._checkReady( 'logger', this._options.logger );
 };
@@ -363,4 +366,22 @@ Deepstream.prototype._onPluginError = function( pluginName, error  ) {
 	this._options.logger.log( C.LOG_LEVEL.ERROR, C.EVENT.PLUGIN_ERROR, msg );
 };
 
+/**
+ * Callback for plugin fatal errors that occur at initialization time. Errors during initialisation
+ * are handled by the DependencyInitialiser
+ *
+ * @private
+ * @returns {void}
+ */
+Deepstream.prototype._onFatal = function() {
+	for( i = 0; i < this.initialisers.length; i++ ) {
+		var initialiser = this.initialisers[i];
+		var dependency = initialiser.getDependency();
+		if( typeof dependency.close === 'function' ) {
+			dependency.close();
+		}
+	}
+	this.emit('fatal')
+};
+
 module.exports = Deepstream;

src/permission/config-permission-handler.js

@@ -247,4 +247,9 @@ ConfigPermissionHandler.prototype._ready = function() {
 	}
 };
 
+ConfigPermissionHandler.prototype.close = function() {
+	this._ruleCache.close();
+	this.emit( 'close' );
+};
+
 module.exports = ConfigPermissionHandler;

src/permission/rule-cache.js

@@ -8,7 +8,7 @@
 var RuleCache = function( options ) {
 	this._options = options;
 	this._data = {};
-	setInterval( this._purge.bind( this ), options.cacheEvacuationInterval );
+	this._intervalId = setInterval( this._purge.bind( this ), options.cacheEvacuationInterval );
 };
 
 /**
@@ -106,4 +106,16 @@ RuleCache.prototype._purge = function() {
 	}
 };
 
-module.exports = RuleCache;
+/**
+ * Stop the interval to trigger the _purge method.
+ *
+ * @private
+ * @returns {void}
+ */
+RuleCache.prototype.close = function() {
+	if (this._intervalId) {
+		clearInterval( this._intervalId );
+	}
+}
+
+module.exports = RuleCache;

src/utils/dependency-initialiser.js

@@ -68,7 +68,7 @@ DependencyInitialiser.prototype._onReady = function() {
  */
 DependencyInitialiser.prototype._onTimeout = function() {
 	this._logError( this._name + ' wasn\'t initialised in time' );
-	process.exit( 1 );
+	this.emit( 'fatal' )
 };
 
 /**
@@ -84,8 +84,9 @@ DependencyInitialiser.prototype._onTimeout = function() {
 DependencyInitialiser.prototype._onError = function( error ) {
 	if( this.isReady !== true ) {
 		this._logError( 'Error while initialising ' + this._name + ': ' + error.toString() );
-		process.exit( 1 );
 	}
+	this.emit( 'fatal' )
+
 };
 
 /**

test/utils/dependency-initialiserSpec.js

@@ -39,8 +39,8 @@ describe( 'encounters timeouts and errors during dependency initialisations', fu
 	var dependencyInitialiser;
 	var readySpy;
 	var onReady = jasmine.createSpy( 'onReady' );
-	var exit = jasmine.createSpy( 'exit');
 	var log = jasmine.createSpy( 'log' );
+	var fatal = jasmine.createSpy( 'fatal' );
 	var originalProcessExit = process.exit;
 	var originalConsoleLog = console.log;
 	var options = {
@@ -49,10 +49,7 @@ describe( 'encounters timeouts and errors during dependency initialisations', fu
 		dependencyInitialisationTimeout: 1
 	};
 
-	it( 'disables process exit', function(){
-		Object.defineProperty( process, 'exit', {
-			value: exit
-		});
+	it( 'disables console.error', function(){
 
 		Object.defineProperty( console, 'error', {
 			value: log
@@ -62,13 +59,14 @@ describe( 'encounters timeouts and errors during dependency initialisations', fu
 	it( 'creates a depdendency initialiser', function( next ){
 		dependencyInitialiser = new DependencyInitialiser( options, 'plugin' );
 		dependencyInitialiser.on( 'ready', onReady );
+		dependencyInitialiser.on( 'fatal', fatal );
 		expect( options.plugin.isReady ).toBe( false );
 		setTimeout( next, 5 );
 	});
 
 	it( 'doesnt initialise a plugin in time', function(){
 		expect( onReady ).not.toHaveBeenCalled();
-		expect( exit ).toHaveBeenCalled();
+		expect( fatal ).toHaveBeenCalled();
 		expect( options.logger.log ).toHaveBeenCalledWith(  3, 'PLUGIN_ERROR', 'plugin wasn\'t initialised in time' );
 	});
 
@@ -81,19 +79,16 @@ describe( 'encounters timeouts and errors during dependency initialisations', fu
 	});
 
 	it( 'has logged the plugin error', function(){
-		expect( exit ).toHaveBeenCalled();
+		expect( fatal ).toHaveBeenCalled();
 		expect( onReady ).not.toHaveBeenCalled();
 		expect( log ).toHaveBeenCalledWith(  'Error while initialising dependency' );
 		expect( log ).toHaveBeenCalledWith(  'Error while initialising plugin: something went wrong' );
 	});
 
-	it( 'enables process exit', function(){
-		Object.defineProperty( process, 'exit', {
-			value: originalProcessExit
-		});
+	it( 'enables console.error', function(){
 
 		Object.defineProperty( console, 'error', {
 			value: originalConsoleLog
 		});
 	});
-});
+});