Merge pull request #424 from DeFiCh/fix/shutdown_node

chore: added logs and bump app version
BirthdayResearch · Jan 29, 2021 · 4c0570c · 4c0570c
2 parents 44b6685 + 49b887a
commit 4c0570c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 10 deletions.
diff --git a/electron-app/src/services/defiprocessmanager.ts b/electron-app/src/services/defiprocessmanager.ts
@@ -174,7 +174,7 @@ export default class DefiProcessManager {
 
   static async stop() {
     try {
-      log.info('Stopping DeFi Process Manager');
+      log.info('[Stop Node] Start DeFiProcessManager shutdown...');
       const pid = getFileData(PID_FILE_NAME);
       while (true) {
         log.info('Attempting Defi Process Manager Stop...');
@@ -197,13 +197,16 @@ export default class DefiProcessManager {
   }
 
   static async restart(args: any, event: Electron.IpcMainEvent) {
-    log.info('Restart node started');
+    log.info('[Restart Node] Starting');
     const stopResponse = await this.stop();
+    log.info('[Restart Node] Stop completed');
     if (args && args.updatedConf && Object.keys(args.updatedConf).length) {
       const updatedConfigData = ini.encode(args.updatedConf);
       writeFile(CONFIG_FILE_NAME, updatedConfigData, false);
     }
+    log.info('[Restart Node] Restarting DefiProcessManager');
     const startResponse = await this.start(args || {}, event);
+    log.info('[Restart Node] Start completed');
     if (
       stopResponse &&
       startResponse &&

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defi-app",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "description": "DeFi Blockchain App",
   "main": "./electron-app/build/electron-app/index.js",
   "author": {

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
diff --git a/webapp/package.json b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "defi-app",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "description": "DeFi Blockchain App",
   "author": {
     "name": "DeFiChain Foundation",

diff --git a/webapp/src/containers/ConsolePage/__test__/__snapshots__/consoleComponent.test.tsx.snap b/webapp/src/containers/ConsolePage/__test__/__snapshots__/consoleComponent.test.tsx.snap
@@ -33,7 +33,7 @@ exports[`Console component snapshot test of console component 1`] = `
           continue={[Function]}
           handler={[Function]}
           promptLabel=""
-          welcomeMessage="defi-app_v2.1.13"
+          welcomeMessage="defi-app_v2.1.14"
         >
           <div
             className="react-console-container react-console-focus"
@@ -42,7 +42,7 @@ exports[`Console component snapshot test of console component 1`] = `
             <div
               className="react-console-message react-console-welcome"
             >
-              defi-app_v2.1.13
+              defi-app_v2.1.14
             </div>
             <ConsolePrompt
               argument={null}

diff --git a/webapp/src/containers/RpcConfiguration/saga.ts b/webapp/src/containers/RpcConfiguration/saga.ts
@@ -31,9 +31,12 @@ import { WALLET_TOKENS_PATH } from '../../constants';
 function* blockChainNotStarted(message) {
   const { isRunning } = yield select((state) => state.app);
   if (!isRunning) {
+    log.error(`${message ?? ''}`, 'blockChainNotStarted - Not Running');
     yield put(startNodeFailure(message));
-    log.error(`${message ?? ''}`, 'startNodeFailure - blockChainNotStarted');
-  } else yield put(openErrorModal());
+  } else {
+    log.error(`Node is disconnected`, 'blockChainNotStarted - Running');
+    yield put(openErrorModal());
+  }
 }
 
 function* resetAppRoute() {
@@ -55,6 +58,7 @@ export function* getConfig() {
         const chan = yield call(startBinary, res.data);
         while (true) {
           const blockchainStatus = yield take(chan);
+          log.info(blockchainStatus, 'Blockchain Status');
           if (blockchainStatus.status) {
             yield put(startNodeSuccess());
             yield put(closeRestartLoader());