Skip to content
Extraits de code Groupes Projets
Vérifiée Valider b6b4f0ce rédigé par Kubat's avatar Kubat
Parcourir les fichiers

MISC: Use the same logger everywhere, which output to stderr if possible

parent 1967e5fe
Aucune branche associée trouvée
Aucune étiquette associée trouvée
2 requêtes de fusion!3Dev kubat,!2Base interface and system
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
*/ */
const winston = require('winston'); const winston = require('winston');
const fs = require('fs');
const __loggerCustomLevels = { const __loggerCustomLevels = {
label: "default", label: "default",
...@@ -29,13 +30,17 @@ const __loggerCustomLevels = { ...@@ -29,13 +30,17 @@ const __loggerCustomLevels = {
} }
}; };
const __myFormat = winston.format.printf(({ level, message, label, timestamp }) => { var transport;
// return `[${timestamp}] ${level}\t ${message}`; if (fs.existsSync("/dev/stderr")) {
return `[${timestamp}] ${message}`; /* /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({ module.exports = global.logger = module.exports = winston.createLogger({
transports: [new winston.transports.Console()], transports: [ transport ],
level: "debug", level: "debug",
json: false, json: false,
handleExceptions: true, handleExceptions: true,
...@@ -45,6 +50,8 @@ module.exports = global.logger = module.exports = winston.createLogger({ ...@@ -45,6 +50,8 @@ module.exports = global.logger = module.exports = winston.createLogger({
winston.format.label(), winston.format.label(),
winston.format.colorize({ all: true }), winston.format.colorize({ all: true }),
winston.format.simple(), winston.format.simple(),
__myFormat winston.format.printf(({ level, message, label, timestamp }) => {
return `[${timestamp}] ${message}`;
})
) )
}); });
const { ipcRenderer } = require('electron'); const { ipcRenderer } = require('electron');
const logger = require('../common/logger.js');
const karaJSON = require('../test/dummyKara.json'); const karaJSON = require('../test/dummyKara.json');
...@@ -8,9 +9,9 @@ window.onload = function(){ ...@@ -8,9 +9,9 @@ window.onload = function(){
ipcRenderer.send('close-app') ipcRenderer.send('close-app')
}); });
karaList(karaJSON); karaList(karaJSON);
logger.debug("Window loaded");
} }
function karaList(karas){ function karaList(karas){
var karaList = ""; var karaList = "";
var playingList = ""; var playingList = "";
......
const logger = require.main.require('./common/logger.js');
const electron = require('electron') const electron = require('electron')
const { app, BrowserWindow } = require('electron') const { app, BrowserWindow } = require('electron')
const { ipcMain } = require('electron') const { ipcMain } = require('electron')
const { fork } = require('child_process'); const { fork } = require('child_process');
/* Sub process for the express server */
var client;
/** Creates the main window and process for the admin interface /** Creates the main window and process for the admin interface
*/ */
...@@ -20,8 +23,6 @@ function createInstanceWindow () { ...@@ -20,8 +23,6 @@ function createInstanceWindow () {
win.webContents.openDevTools(); win.webContents.openDevTools();
} }
var client;
ipcMain.on('close-app', (evt, arg) => { ipcMain.on('close-app', (evt, arg) => {
app.quit() app.quit()
}) })
...@@ -31,7 +32,7 @@ app.on("quit", () => { ...@@ -31,7 +32,7 @@ app.on("quit", () => {
}); });
app.on('ready', () => { app.on('ready', () => {
console.log('Ready'); logger.info("Main window is ready");
createInstanceWindow(); createInstanceWindow();
client = fork('client/main.js'); client = fork('client/main.js');
}); });
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter