From d567c215bbf17f2232775ee0dca443cd47d1ef63 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 8 Jan 2016 08:47:16 -0800 Subject: [PATCH] Update console log paths to be in OS app data directory --- console/src/main.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/console/src/main.js b/console/src/main.js index 3b18c5961c..99ee15dd81 100644 --- a/console/src/main.js +++ b/console/src/main.js @@ -16,12 +16,22 @@ var Process = hfprocess.Process; var ProcessGroup = hfprocess.ProcessGroup; var ProcessGroupStates = hfprocess.ProcessGroupStates; +function getApplicationDataDirectory() { + // Taken from http://stackoverflow.com/questions/19275776/node-js-how-to-get-the-os-platforms-user-data-folder + var rootDirectory = process.env.APPDATA || (process.platform == 'darwin' ? process.env.HOME + 'Library/Preferences' : '/var/local') + return path.join(rootDirectory, '/High Fidelity/Console'); +} + + const ipcMain = electron.ipcMain; const osType = os.type(); var path = require('path'); +var logPath = path.join(getApplicationDataDirectory(), '/logs'); +console.log("Log directory:", logPath); + const TRAY_FILENAME = (osType == "Darwin" ? "console-tray-Template.png" : "console-tray.png"); const TRAY_ICON = path.join(__dirname, '../resources/' + TRAY_FILENAME); const APP_ICON = path.join(__dirname, '../resources/console.png'); @@ -186,8 +196,6 @@ app.on('ready', function() { app.dock.hide() } - var logPath = path.join(app.getAppPath(), 'logs'); - // Create tray icon tray = new Tray(TRAY_ICON); tray.setToolTip('High Fidelity');