Implemented a temporary "no stop" setting

CoinageCrypto · Apr 22, 2019 · fb19992 · fb19992
1 parent 9067c4c
commit fb19992
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 35 deletions.
diff --git a/src/cli/lamington-build.ts b/src/cli/lamington-build.ts
@@ -1,32 +1,25 @@
-import { eosIsReady, startEos, runTests, stopContainer, buildAll } from './utils';
+import { eosIsReady, startEos, stopContainer, buildAll } from './utils';
 import { GitIgnoreManager } from '../gitignoreManager';
 import { ConfigManager } from '../configManager';
 
 const run = async () => {
-	if (await eosIsReady()) {
-		console.log('EOS is running. Stopping...');
+	// Initialize configuration
+	await ConfigManager.initWithDefaults();
+	// Stop container if running
+	if (!ConfigManager.keepAlive && await eosIsReady()) {
 		await stopContainer();
 	}
-
-	// This initialises the config
-	console.log('Getting configuration...');
-	await ConfigManager.initWithDefaults();
-
 	// This ensures we have our .gitignore inside the .lamington directory
 	await GitIgnoreManager.createIfMissing();
-
-	console.log('Starting EOS...');
-	await startEos();
-
-	console.log('Building smart contracts...');
+	// Start the EOSIO container image
+	if (!await eosIsReady()) {
+		await startEos();
+	}
+	// Build all smart contracts
 	await buildAll();
-
-	console.log('Stopping EOS...');
-	await stopContainer();
 };
 
 run().catch(error => {
-	console.log('Stopping EOS...');
 	stopContainer().then(() => {
 		throw error;
 	});

diff --git a/src/cli/lamington-test.ts b/src/cli/lamington-test.ts
@@ -3,29 +3,26 @@ import { GitIgnoreManager } from '../gitignoreManager';
 import { ConfigManager } from '../configManager';
 
 const run = async () => {
-	if (await eosIsReady()) {
-		console.log('EOS is running. Stopping...');
+	// Initialize the configuration
+	await ConfigManager.initWithDefaults();
+	// Stop running instances when keepAlive is false
+	if (!ConfigManager.keepAlive && await eosIsReady()) {
 		await stopContainer();
 	}
-
-	// This initialises the config
-	console.log('Getting configuration...');
-	await ConfigManager.initWithDefaults();
-
-	// This ensures we have our .gitignore inside the .lamington directory
+	// Ensures we have our .gitignore inside the .lamington directory
 	await GitIgnoreManager.createIfMissing();
-
-	console.log('Starting EOS...');
-	await startEos();
-
-	console.log('Building smart contracts...');
+	// Start an EOSIO instance if not running
+	if (!await eosIsReady()) {
+		await startEos();
+	}
+	// Start compiling smart contracts
 	await buildAll();
-
-	console.log('Running tests...');
+	// Begin running tests
 	await runTests();
-
-	console.log('Stopping EOS...');
-	await stopContainer();
+	// Stop EOSIO instance if keepAlive is false
+	if (!ConfigManager.keepAlive) {
+		await stopContainer();
+	}
 };
 
 run().catch(error => {