Add Log plaug

zhuzhuyule · Jan 30, 2018 · 4a99d29 · 4a99d29
1 parent bd8997b
commit 4a99d29
Show file tree

Hide file tree

Showing 11 changed files with 825 additions and 706 deletions.
diff --git a/app/moe-action.js b/app/moe-action.js
@@ -22,6 +22,7 @@
 
 const {dialog} = require('electron'),
     MoeditorFile = require('./moe-file'),
+    log = log4js.getLogger('action.js'),
     moment = require('moment'),
     fs = require('fs'),
     path = require('path');
@@ -98,7 +99,7 @@ class MoeditorAction {
                 }
             }
         } catch (e) {
-            console.log(e)
+            log.error(e)
         } finally {
             if (notOpened)
                 moeApp.open();
@@ -141,7 +142,7 @@ class MoeditorAction {
                             hexoWindow.focus();
                             break;
                         } catch (e) {
-                            console.log(e);
+                            log.error(e);
                         }
                     }
                 }
@@ -178,7 +179,7 @@ class MoeditorAction {
                     type: 'error',
                     content: __('Can\'t save file') + ', ' + e.toString()
                 });
-                console.log('Can\'t save file: ' + e.toString());
+                log.error('Can\'t save file: ' + e.toString());
                 return false;
             }
         }
@@ -222,7 +223,7 @@ class MoeditorAction {
                 type: 'error',
                 content: __('Can\'t save file') + ', ' + e.toString()
             });
-            console.log('Can\'t save file: ' + e.toString());
+            log.error('Can\'t save file: ' + e.toString());
             return false;
         }
     }
@@ -256,7 +257,7 @@ class MoeditorAction {
                     type: 'error',
                     content: __('Can\'t export as HTML') + ', ' + e.toString()
                 });
-                console.log('Can\'t export as HTML: ' + e.toString());
+                log.error('Can\'t export as HTML: ' + e.toString());
             }
         });
     }
@@ -282,7 +283,7 @@ class MoeditorAction {
                     type: 'error',
                     content: __('Can\'t export as PDF') + ', ' + e.toString()
                 });
-                console.log('Can\'t export as PDF: ' + e.toString());
+                log.warn('Can\'t export as PDF: ' + e.toString());
             }
             try {
                 hexoWindow.hexoeditorWindow.window.webContents.send('pop-message', {

diff --git a/app/moe-app.js b/app/moe-app.js
@@ -21,6 +21,7 @@
 
 'use strict';
 
+global.log4js = require('log4js');
 const MoeditorWindow = require('./moe-window'),
     MoeditorAction = require('./moe-action'),
     MoeditorFile = require('./moe-file'),
@@ -38,6 +39,21 @@ class MoeditorApplication {
     constructor() {
         this.windows = new Array();
         this.hexoWindow = null;
+        log4js.configure({
+            appenders: {
+                out: {type: 'stdout', level: 'all'},//设置是否在控制台打印日志
+                debugs: {type: 'file', filename: './logs/debug.log', level: 'debug',maxLogSize: 1024*1024*5},
+                infos: {type: 'file', filename: './logs/log.log', level: 'debug',maxLogSize: 1024*1024*5},
+                errors: { type: 'file', filename: './logs/error.log' ,maxLogSize: 1024*1024*2},
+                debug: { type: 'logLevelFilter', appender: 'debugs', level: 'debug' },
+                info: { type: 'logLevelFilter', appender: 'infos', level: 'info' },
+                error: { type: 'logLevelFilter', appender: 'errors', level: 'error' }
+            },
+            categories: {
+                default: {appenders: ['out', 'info', 'debug','error'], level: 'debug'}
+            }
+        })
+        global.log = log4js.getLogger('log');
     }
 
     open(fileName, defName) {
@@ -49,14 +65,18 @@ class MoeditorApplication {
     }
 
     getShellServer() {
-        if (!shellServer)
+        if (!shellServer){
+            log.info('create shellServer');
             shellServer = new (require('./tool/hexo-shell'))();
+        }
         return shellServer;
     }
 
     getUploadServer() {
-        if (!uploadServer)
+        if (!uploadServer) {
+            log.info('create uploadServer');
             uploadServer = new (require('./tool/hexo-uploadServer'))();
+        }
         return uploadServer;
     }
 
@@ -71,7 +91,6 @@ class MoeditorApplication {
 
         this.locale = new MoeditorLocale();
         global.__ = str => this.locale.get(str);
-
         this.flag = new Object();
 
         const a = process.argv;
@@ -256,6 +275,9 @@ class MoeditorApplication {
     setHexo(hexo) {
         this.hexo = hexo;
     }
+    getLog4js(){
+        return log4js;
+    }
 }
 
 MoeditorApplication.count = 0;

diff --git a/app/moe-window.js b/app/moe-window.js
@@ -28,7 +28,7 @@ const BrowserWindow = require('electron').BrowserWindow,
 class MoeditorWindow {
 	constructor(path,defName) {
         moeApp.hexoWindow = this;
-
+        log.info('create window');
         if (MoeditorFile.isDirectory(path)) {
             this.directory = path
             this.fileName = '';
@@ -97,7 +97,6 @@ class MoeditorWindow {
                 }
             }
 
-            console.log(this.window == moeApp.getShellServer().lastWindow)
             if (this.window == moeApp.getShellServer().lastWindow)
                 process.nextTick(moeApp.getShellServer().kill,false);