diff --git a/client/package-lock.json b/client/package-lock.json index 445606277e7c1f244c8d4c548f759645399d42c2..e43a47e9cae6af0ba5af558eda59a1d2a5be93de 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -2580,6 +2580,11 @@ } } }, + "electron-log": { + "version": "4.4.6", + "resolved": "https://registry.npmmirror.com/electron-log/-/electron-log-4.4.6.tgz", + "integrity": "sha512-nirYgRdY+F+vclr8ijdwy2vW03IzFpDHTaKNWu76dEN21Y76+smcES5knS7cgHUUB0qNLOi8vZO36taakjbSXA==" + }, "electron-notarize": { "version": "1.1.1", "resolved": "https://registry.npmmirror.com/electron-notarize/-/electron-notarize-1.1.1.tgz", @@ -2636,7 +2641,7 @@ "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz", + "resolved": "https://registry.npmmirror.com/debug/download/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { @@ -3565,7 +3570,7 @@ "dependencies": { "debug": { "version": "3.2.7", - "resolved": "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz", + "resolved": "https://registry.npmmirror.com/debug/download/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "requires": { @@ -3660,7 +3665,7 @@ "dependencies": { "debug": { "version": "2.6.9", - "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz", + "resolved": "https://registry.npmmirror.com/debug/download/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { diff --git a/client/package.json b/client/package.json index 5300510e4ecc39fac01a57f2488517db90db7402..9deb2d693a4d33b7968d0df52cfc16ee12551dc0 100644 --- a/client/package.json +++ b/client/package.json @@ -39,6 +39,7 @@ "style-loader": "^3.3.1" }, "dependencies": { + "electron-log": "^4.4.6", "electron-squirrel-startup": "^1.0.0" } } diff --git a/client/src/main.js b/client/src/main.js index 643b07a8e2fdf9bff83fe1f84c43830e276ba52f..1b9387877bd6b0e711e04fc3591cbbca2d782710 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -1,5 +1,5 @@ import {app, BrowserWindow} from 'electron'; -import {getUIServerUrl, startZtfServer, killZtfServer} from './services'; +import {getUIServerUrl, startZtfServer, killZtfServer, logInfo, logErr} from './services'; // Handle creating/removing shortcuts on Windows when installing/uninstalling. if (require('electron-squirrel-startup')) { // eslint-disable-line global-require @@ -24,7 +24,6 @@ const createWindow = (url) => { mainWindow.webContents.openDevTools({mode: 'bottom'}); }; - let _starting = false; async function startApp() { @@ -35,9 +34,9 @@ async function startApp() { try { const ztfServerUrl = await startZtfServer(); - console.log(`>> ZTF Server started successfully: ${ztfServerUrl}`); + logInfo(`>> ZTF Server started successfully: ${ztfServerUrl}`); } catch (error) { - console.error('>> Start ztf server failed: ' + error); + logErr('>> Start ztf server failed: ' + error); process.exit(1); return; } diff --git a/client/src/services.js b/client/src/services.js index dade39694fc8190025f08cc0bdcb849bd4c6717c..b9c63d43be11d43fe3e8f0945d357d141a2d22c8 100644 --- a/client/src/services.js +++ b/client/src/services.js @@ -211,3 +211,13 @@ export function getUIServerUrl() { _uiServerApp = cmd; }); } + + +const logger = require('electron-log'); +logger.transports.file.resolvePath = () => require("path").join(require("os").homedir(), 'ztf', 'log', 'electron.log'); +export function logInfo(str) { + logger.info(str); +} +export function logErr(str) { + logger.error(str); +} \ No newline at end of file