From c5c503f1b51326eb9c626cc599ed2c63123b5d60 Mon Sep 17 00:00:00 2001
From: Zhiting Lin <zlin035@uottawa.ca>
Date: Tue, 10 Apr 2018 15:21:55 +0800
Subject: [PATCH] change the show log option in the menu to bytomd.

---
 main-process/logger.js                 | 11 ++++++---
 main-process/menus/application-menu.js |  2 +-
 main.js                                | 41 ++++++++++++++++++++++------------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/main-process/logger.js b/main-process/logger.js
index 675b289..4a01d52 100644
--- a/main-process/logger.js
+++ b/main-process/logger.js
@@ -19,17 +19,22 @@ exports.setup = function (options) {
       },
       main: {
         type: 'file',
-        filename: `${logFolder}/category/main.log`,
+        filename: `${logFolder}/electron/main.log`,
 
       },
       menu: {
         type: 'file',
-        filename: `${logFolder}/category/menu.log`
+        filename: `${logFolder}/electron/menu.log`
+      },
+      bytomd: {
+        type: 'file',
+        filename: `${logFolder}/bytomd/bytomd.log`
       }
     },
     categories: {
       default: { appenders: [ 'out', 'all', 'main' ], level },
-      menu: { appenders: [ 'out', 'all', 'menu' ], level }
+      menu: { appenders: [ 'out', 'all', 'menu' ], level },
+      bytomd: { appenders: [ 'out', 'all', 'bytomd' ], level }
     }
   }
 
diff --git a/main-process/menus/application-menu.js b/main-process/menus/application-menu.js
index 6ec609e..905aa61 100755
--- a/main-process/menus/application-menu.js
+++ b/main-process/menus/application-menu.js
@@ -221,7 +221,7 @@ let menuTempl = function () {
     label: i18n.t('desktop.applicationMenu.develop.logFiles'),
     click() {
       try {
-        shell.showItemInFolder(path.join(app.getPath('userData'), 'logs', 'all.log'))
+        shell.showItemInFolder(path.join(app.getPath('userData'), 'logs', 'bytomd', 'bytomd.log'))
       } catch (error) {
         log.error(error)
       }
diff --git a/main.js b/main.js
index e3a6e0c..327363f 100644
--- a/main.js
+++ b/main.js
@@ -6,6 +6,7 @@ const path = require('path')
 const fs = require('fs')
 const logger = require('./main-process/logger')
 const log = logger.create('main')
+const bytomdLog = logger.create('bytomd')
 
 let win, bytomdInit, bytomdMining
 
@@ -42,7 +43,7 @@ function initialize () {
 
     win.on('closed', () => {
       win = null
-      quitApp('closed')
+      quitApp()
     })
   }
 
@@ -60,7 +61,7 @@ function initialize () {
 //All window Closed
   app.on('window-all-closed', () => {
     if (process.platform !== 'darwin') {
-      quitApp('window-all-closed')
+      quitApp()
     }
   })
 
@@ -68,7 +69,17 @@ function initialize () {
     if (win === null) {
       createWindow()
     }
+  })
 
+  app.on('before-quit', () => {
+    if(bytomdInit != null){
+      bytomdInit.kill()
+      log.info('Kill bytomd Init command...')
+    }
+    if(bytomdMining != null){
+      bytomdMining.kill()
+      log.info('Kill bytomd Mining command...')
+    }
   })
 }
 const bytomdPath = process.env.DEV?
@@ -80,25 +91,25 @@ function setBytomMining(event) {
   bytomdMining = exec( `${bytomdPath} node --mining --home "${bytomdDataPath}" --web.closed` ,
     (error, stdout, stderr) => {
       if (error) {
-        log.error(`bytomd mining exec error: ${error}`)
+        bytomdLog.error(`bytomd mining exec error: ${error}`)
       }
-      log.info(`bytomd mining stdout: ${stdout}`)
-      log.info(`bytomd mining stderr: ${stderr}`)
+      bytomdLog.info(`bytomd mining stdout: ${stdout}`)
+      bytomdLog.info(`bytomd mining stderr: ${stderr}`)
     })
 
   bytomdMining.stdout.on('data', function(data) {
-    log.info(`bytomd mining stdout: ${data}`)
+    bytomdLog.info(`bytomd mining stdout: ${data}`)
   })
 
   bytomdMining.stderr.on('data', function(data) {
-    log.info(`bytomd mining stderr: ${data}`)
+    bytomdLog.info(`bytomd mining stderr: ${data}`)
     if(data.includes('msg="Started node"') && event){
       event.sender.send('ConfiguredNetwork','startNode')
     }
   })
 
   bytomdMining.on('exit', function (code) {
-    log.info('bytom Mining exited with code ' + code)
+    bytomdLog.info('bytom Mining exited with code ' + code)
   })
 }
 
@@ -107,21 +118,21 @@ function setBytomInit(event, bytomNetwork) {
   bytomdInit = exec(`${bytomdPath} init --chain_id  ${bytomNetwork} --home "${bytomdDataPath}"` ,
     (error, stdout, stderr) => {
       if (error) {
-        log.error(`bytomd init exec error: ${error}`)
+        bytomdLog.error(`bytomd init exec error: ${error}`)
       }
-      log.info(`bytomd init stdout: ${stdout}`)
-      log.info(`bytomd init stderr: ${stderr}`)
+      bytomdLog.info(`bytomd init stdout: ${stdout}`)
+      bytomdLog.info(`bytomd init stderr: ${stderr}`)
     })
   bytomdInit.stdout.on('data', function(data) {
-    log.info(`bytomd init stdout: ${data}`)
+    bytomdLog.info(`bytomd init stdout: ${data}`)
   })
   bytomdInit.stderr.on('data', function(data) {
-    log.info(`bytomd init stderr: ${data}`)
+    bytomdLog.info(`bytomd init stderr: ${data}`)
   })
   bytomdInit.on('exit', function (code) {
     event.sender.send('ConfiguredNetwork','init')
     setBytomMining(event)
-    log.info('bytom init exited with code ' + code)
+    bytomdLog.info('bytom init exited with code ' + code)
   })
 }
 
@@ -178,9 +189,11 @@ switch (process.argv[1]) {
 function quitApp () {
   if(bytomdInit != null){
     bytomdInit.kill()
+    log.info('Kill bytomd Init command...')
   }
   if(bytomdMining != null){
     bytomdMining.kill()
+    log.info('Kill bytomd Mining command...')
   }
   app.quit()
 }
-- 
2.11.0