From b0a22599e7c6e3cae5c6da2e10098edd4376ac3e Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 24 Oct 2016 10:57:27 -0700 Subject: [PATCH] Make log global --- server-console/src/main.js | 4 ++-- server-console/src/modules/config.js | 1 - server-console/src/modules/hf-process.js | 1 - server-console/src/modules/hf-updater.js | 1 - server-console/src/modules/path-finder.js | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) mode change 100755 => 100644 server-console/src/modules/hf-process.js diff --git a/server-console/src/main.js b/server-console/src/main.js index 6f26de1b84..f23c533108 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -1,12 +1,12 @@ 'use strict'; +global.log = require('electron-log'); + const electron = require('electron'); const app = electron.app; // Module to control application life. const BrowserWindow = electron.BrowserWindow; const nativeImage = electron.nativeImage; -const log = require('electron-log'); - const notifier = require('node-notifier'); const util = require('util'); const dialog = electron.dialog; diff --git a/server-console/src/modules/config.js b/server-console/src/modules/config.js index 3853de1567..438c377154 100644 --- a/server-console/src/modules/config.js +++ b/server-console/src/modules/config.js @@ -1,6 +1,5 @@ var fs = require('fs'); var extend = require('extend'); -var log = require('electron-log'); function Config() { this.data = {}; diff --git a/server-console/src/modules/hf-process.js b/server-console/src/modules/hf-process.js old mode 100755 new mode 100644 index 9e8fb47ccd..20b8966148 --- a/server-console/src/modules/hf-process.js +++ b/server-console/src/modules/hf-process.js @@ -8,7 +8,6 @@ const childProcess = require('child_process'); const fs = require('fs-extra'); const os = require('os'); const path = require('path'); -const log = require('electron-log'); const ProcessGroupStates = { STOPPED: 'stopped', diff --git a/server-console/src/modules/hf-updater.js b/server-console/src/modules/hf-updater.js index 750e5d6a95..489364f655 100644 --- a/server-console/src/modules/hf-updater.js +++ b/server-console/src/modules/hf-updater.js @@ -4,7 +4,6 @@ const util = require('util'); const events = require('events'); const cheerio = require('cheerio'); const os = require('os'); -const log = require('electron-log'); const platform = os.type() == 'Windows_NT' ? 'windows' : 'mac'; diff --git a/server-console/src/modules/path-finder.js b/server-console/src/modules/path-finder.js index 5e2af8c900..5ecd2c74ff 100644 --- a/server-console/src/modules/path-finder.js +++ b/server-console/src/modules/path-finder.js @@ -1,6 +1,5 @@ var fs = require('fs'); var path = require('path'); -var log = require('electron-log'); function platformExtension(name) { if (name == "Interface") {