Feature/#243 (#263)

* 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

* minor fixes:
- print help if unkown command was used
- fix printing option name for invalid integers
- fix passing lib-dir option in detach mode
- attempt to fix detached mode on linux binaries
- remove color option from root level
- delete init-script

* Revert "emit a fatal event instead of exit the process"

This reverts commit 53dffe7.

* throw error (uncaughtException) instead of exit the process

bin/deepstream

@@ -28,4 +28,9 @@ program.parse( process.argv );
 
 if ( program.args.length === 0 ) {
 	program.emit( 'start' );
-}
+} else {
+	if( typeof program.args[0] === 'string' ) {
+		console.log( program.help() );
+	}
+	// otherwise its an Command object
+}

bin/deepstream-start.js

@@ -47,19 +47,22 @@ function action() {
 			args.push( this.config );
 		}
 		if ( this.libDir != null ) {
-			args.push( '--libDir' );
+			args.push( '--lib-dir' );
 			args.push( this.libDir );
 		}
+		// TODO: need to pass other options as well, which are accessable directly as properties of this
+		//       but need to transform camelCase back to kebabCase, like tcpPort
+
 		// ensure there is no pid file with a running process
 		pidHelper.ensureNotRunning( function( err ) {
 			if ( err ) {
 				return pidHelper.exit( err );
 			}
-			const child = child_process.spawn( path.resolve( __dirname, 'deepstream' ), ['start'].concat( args ), {
+			const child = child_process.spawn( path.join(__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 );
@@ -74,6 +77,7 @@ function action() {
 		// non-detach casee
 		const Deepstream = require( '../src/deepstream.io.js' );
 		try {
+			process.on( 'uncaughtException', pidHelper.exit );
 			var ds = new Deepstream( null );
 			ds.on( 'started', function() {
 				pidHelper.save( process.pid );
@@ -86,12 +90,11 @@ function action() {
 		process.
 			removeAllListeners( 'SIGINT' ).on( 'SIGINT', pidHelper.exit ).
 			removeAllListeners( 'SIGTERM' ).on( 'SIGTERM', pidHelper.exit );
-
 	}
 }
 
 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 );
 }
 
@@ -116,7 +119,7 @@ function parseLogLevel( logLevel ) {
 function parseInteger( name, port ) {
 	const portNumber = Number( port );
 	if( !portNumber ) {
-		console.error( 'Provided ${name} must be an integer' );
+		console.error( `Provided ${name} must be an integer` );
 		process.exit(1);
 	}
 	return portNumber;
@@ -139,4 +142,4 @@ function parseBoolean( name, enabled ) {
 		process.exit( 1 );
 	}
 	return isEnabled;
-}
+}

scripts/package.sh

@@ -232,8 +232,7 @@ if [ $OS = "linux" ]; then
 		-f \
 		$DEEPSTREAM_PACKAGE/conf/=/etc/deepstream/conf.d/ \
 		$DEEPSTREAM_PACKAGE/lib/=/var/lib/deepstream/ \
-		./build/deepstream=/usr/bin/deepstream \
-		./scripts/daemon/init-script=/etc/init.d/deepstream
+		./build/deepstream=/usr/bin/deepstream
 
 	echo -e "\t\tCreating deb"
 	fpm \
@@ -256,8 +255,7 @@ if [ $OS = "linux" ]; then
 		--deb-no-default-config-files \
 		$DEEPSTREAM_PACKAGE/conf/=/etc/deepstream/conf.d/ \
 		$DEEPSTREAM_PACKAGE/lib/=/var/lib/deepstream/ \
-		./build/deepstream=/usr/bin/deepstream \
-		./scripts/daemon/init-script=/etc/init.d/deepstream
+		./build/deepstream=/usr/bin/deepstream
 fi
 
 rm -rf $DEEPSTREAM_PACKAGE

src/constants/constants.js

@@ -59,6 +59,8 @@ exports.EVENT.INVALID_MESSAGE = 'INVALID_MESSAGE';
 exports.EVENT.VERSION_EXISTS = 'VERSION_EXISTS';
 exports.EVENT.INVALID_VERSION = 'INVALID_VERSION';
 exports.EVENT.PLUGIN_ERROR = 'PLUGIN_ERROR';
+exports.EVENT.PLUGIN_INITIALIZATION_ERROR = 'PLUGIN_INITIALIZATION_ERROR';
+exports.EVENT.PLUGIN_INITIALIZATION_TIMEOUT = 'PLUGIN_INITIALIZATION_TIMEOUT';
 exports.EVENT.UNKNOWN_CALLEE = 'UNKNOWN_CALLEE';
 
 exports.TOPIC = {};

src/default-options.js

@@ -7,7 +7,6 @@ exports.get = function() {
 		 * General
 		 */
 		serverName: utils.getUid(),
-		colors: true,
 		showLogo: true,
 		logLevel: C.LOG_LEVEL.INFO,
 

src/utils/dependency-initialiser.js

@@ -67,8 +67,12 @@ DependencyInitialiser.prototype._onReady = function() {
  * @returns {void}
  */
 DependencyInitialiser.prototype._onTimeout = function() {
-	this._logError( this._name + ' wasn\'t initialised in time' );
-	process.exit( 1 );
+	const message = this._name + ' wasn\'t initialised in time';
+	this._logError( message );
+	const error = new Error( message );
+	error.code = C.EVENT.PLUGIN_INITIALIZATION_TIMEOUT;
+	throw error;
+
 };
 
 /**
@@ -84,7 +88,8 @@ 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 );
+		error.code = C.EVENT.PLUGIN_INITIALIZATION_ERROR;
+		throw error;
 	}
 };
 

test/utils/dependency-initialiserSpec.js

@@ -41,59 +41,51 @@ describe( 'encounters timeouts and errors during dependency initialisations', fu
 	var onReady = jasmine.createSpy( 'onReady' );
 	var exit = jasmine.createSpy( 'exit');
 	var log = jasmine.createSpy( 'log' );
-	var originalProcessExit = process.exit;
 	var originalConsoleLog = console.log;
 	var options = {
 		plugin: new PluginMock( 'A' ),
 		logger: { log: jasmine.createSpy( 'log' ), isReady: true },
 		dependencyInitialisationTimeout: 1
 	};
 
-	it( 'disables process exit', function(){
-		Object.defineProperty( process, 'exit', {
-			value: exit
-		});
+	it( 'disables console.error', function(){
 
 		Object.defineProperty( console, 'error', {
 			value: log
 		});
 	});
 
-	it( 'creates a depdendency initialiser', function( next ){
+	it( 'creates a depdendency initialiser and doesnt initialise a plugin in time', function( next ){
 		dependencyInitialiser = new DependencyInitialiser( options, 'plugin' );
 		dependencyInitialiser.on( 'ready', onReady );
 		expect( options.plugin.isReady ).toBe( false );
-		setTimeout( next, 5 );
-	});
-
-	it( 'doesnt initialise a plugin in time', function(){
+		process.once( 'uncaughtException', function() {
+			expect( options.logger.log ).toHaveBeenCalledWith(  3, 'PLUGIN_ERROR', 'plugin wasn\'t initialised in time' );
+			next();
+		} );
 		expect( onReady ).not.toHaveBeenCalled();
-		expect( exit ).toHaveBeenCalled();
-		expect( options.logger.log ).toHaveBeenCalledWith(  3, 'PLUGIN_ERROR', 'plugin wasn\'t initialised in time' );
+
 	});
 
-	it( 'creates another depdendency initialiser', function( next ){
+	it( 'creates another depdendency initialiser with a plugin error', function( next ){
+		process.once( 'uncaughtException', function(err) {
+			expect( onReady ).not.toHaveBeenCalled();
+			expect( log ).toHaveBeenCalledWith(  'Error while initialising dependency' );
+			expect( log ).toHaveBeenCalledWith(  'Error while initialising plugin: something went wrong' );
+			next();
+		} );
 		dependencyInitialiser = new DependencyInitialiser( options, 'plugin' );
 		dependencyInitialiser.on( 'ready', onReady );
 		options.logger.isReady = false;
-		options.plugin.emit( 'error', 'something went wrong' );
-		setTimeout( next , 50 );
-	});
-
-	it( 'has logged the plugin error', function(){
-		expect( exit ).toHaveBeenCalled();
-		expect( onReady ).not.toHaveBeenCalled();
-		expect( log ).toHaveBeenCalledWith(  'Error while initialising dependency' );
-		expect( log ).toHaveBeenCalledWith(  'Error while initialising plugin: something went wrong' );
+		try {
+			options.plugin.emit( 'error', 'something went wrong' );
+			next.fail();
+		} catch (_err) {}
 	});
 
-	it( 'enables process exit', function(){
-		Object.defineProperty( process, 'exit', {
-			value: originalProcessExit
-		});
-
+	it( 'enable console.error', function(){
 		Object.defineProperty( console, 'error', {
 			value: originalConsoleLog
 		});
 	});
-});
+});