diff --git a/common/logger.js b/common/logger.js index e3f20b7c13d4e91525846a1878f63a3c66e0ae4d..6bea962f4d3c1ad222e8b632cebfb31c1305c214 100644 --- a/common/logger.js +++ b/common/logger.js @@ -10,6 +10,7 @@ */ const winston = require('winston'); +const fs = require('fs'); const __loggerCustomLevels = { label: "default", @@ -29,13 +30,17 @@ const __loggerCustomLevels = { } }; -const __myFormat = winston.format.printf(({ level, message, label, timestamp }) => { - // return `[${timestamp}] ${level}\t ${message}`; - return `[${timestamp}] ${message}`; -}); +var transport; +if (fs.existsSync("/dev/stderr")) { + /* /dev/stderr exists */ + transport = new winston.transports.Stream({stream: fs.createWriteStream('/dev/stderr')}); +} else { + /* No /dev/stderr, may be windob' */ + transport = new winston.transports.Console(); +} module.exports = global.logger = module.exports = winston.createLogger({ - transports: [new winston.transports.Console()], + transports: [ transport ], level: "debug", json: false, handleExceptions: true, @@ -45,6 +50,8 @@ module.exports = global.logger = module.exports = winston.createLogger({ winston.format.label(), winston.format.colorize({ all: true }), winston.format.simple(), - __myFormat + winston.format.printf(({ level, message, label, timestamp }) => { + return `[${timestamp}] ${message}`; + }) ) }); diff --git a/instance/main.js b/instance/main.js index cb28417e74a868b101b28660aa5a0257e399e5e0..147a3926e3a87b3ec7bece0068246cc55618d1e1 100644 --- a/instance/main.js +++ b/instance/main.js @@ -1,4 +1,5 @@ -const {ipcRenderer} = require('electron'); +const { ipcRenderer } = require('electron'); +const logger = require('../common/logger.js'); const karaJSON = require('../test/dummyKara.json'); @@ -8,18 +9,18 @@ window.onload = function(){ ipcRenderer.send('close-app') }); karaList(karaJSON); + logger.debug("Window loaded"); } - function karaList(karas){ - var karaList = ""; - var playingList = ""; - karas.forEach(function(kara) { - if(kara.author_name === "Sting"){ - playingList += '<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"><div class="card-body">' + kara.source_name + ' - ' + kara.song_name + '</div></div>'; - } - karaList += '<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"><div class="card-body">' + kara.source_name + ' - ' + kara.song_name + '</div></div>'; - }); - document.getElementById("panelLeft").innerHTML = karaList; - document.getElementById("panelRight").innerHTML = playingList; + var karaList = ""; + var playingList = ""; + karas.forEach(function(kara) { + if(kara.author_name === "Sting"){ + playingList += '<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"><div class="card-body">' + kara.source_name + ' - ' + kara.song_name + '</div></div>'; + } + karaList += '<div class="card shadow" style="margin: 5px; border-radius: 10px; margin: 20px 0px 20px 0px;"><div class="card-body">' + kara.source_name + ' - ' + kara.song_name + '</div></div>'; + }); + document.getElementById("panelLeft").innerHTML = karaList; + document.getElementById("panelRight").innerHTML = playingList; } diff --git a/main.js b/main.js index 76878399224525708930830a5c4b56fbe54fd31a..66f68c635fa1967023f5a562bbb9580f77e19160 100644 --- a/main.js +++ b/main.js @@ -1,8 +1,11 @@ -const electron = require('electron') +const logger = require.main.require('./common/logger.js'); +const electron = require('electron') const { app, BrowserWindow } = require('electron') -const { ipcMain } = require('electron') -const { fork } = require('child_process'); +const { ipcMain } = require('electron') +const { fork } = require('child_process'); +/* Sub process for the express server */ +var client; /** Creates the main window and process for the admin interface */ @@ -20,8 +23,6 @@ function createInstanceWindow () { win.webContents.openDevTools(); } -var client; - ipcMain.on('close-app', (evt, arg) => { app.quit() }) @@ -31,7 +32,7 @@ app.on("quit", () => { }); app.on('ready', () => { - console.log('Ready'); + logger.info("Main window is ready"); createInstanceWindow(); client = fork('client/main.js'); });