Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-08 21:03:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13370 from Atlante45/fix/sandbox-logs

Browse source 
Fix Sandboxes stuck extracting
This commit is contained in:
John Conklin II 2018-06-14 08:26:32 -07:00 committed by GitHub
commit 752ee0ee9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server-console/package.json
View file

@ -27,7 +27,7 @@
"cheerio": "^0.19.0",
"electron-log": "1.1.1",
"extend": "^3.0.0",
"fs-extra": "^1.0.0",
"fs-extra": "^6.0.0",
"node-notifier": "^5.2.1",
"os-homedir": "^1.0.1",
"request": "^2.85.0",

51
server-console/src/main.js
View file

@ -115,17 +115,43 @@ const UPDATER_LOCK_FULL_PATH = getRootHifiDataDirectory() + "/" + UPDATER_LOCK_F
// Configure log
global.log = require('electron-log');
const logFile = getApplicationDataDirectory(true) + '/log.txt';
const oldLogFile = path.join(getApplicationDataDirectory(), '/log.txt');
const logFile = path.join(getApplicationDataDirectory(true), '/log.txt');
if (oldLogFile != logFile && fs.existsSync(oldLogFile)) {
if (!fs.existsSync(oldLogFile)) {
fs.moveSync(oldLogFile, logFile);
} else {
fs.remove(oldLogFile);
}
}
fs.ensureFileSync(logFile); // Ensure file exists
log.transports.file.maxSize = 5 * 1024 * 1024;
log.transports.file.file = logFile;
log.debug("build info", buildInfo);
log.debug("Root hifi directory is: ", getRootHifiDataDirectory());
log.debug("App Data directory:", getApplicationDataDirectory());
fs.ensureDirSync(getApplicationDataDirectory());
var oldLogPath = path.join(getApplicationDataDirectory(), '/logs');
var logPath = path.join(getApplicationDataDirectory(true), '/logs');
if (oldLogPath != logPath && fs.existsSync(oldLogPath)) {
if (!fs.existsSync(oldLogPath)) {
fs.moveSync(oldLogPath, logPath);
} else {
fs.remove(oldLogPath);
}
}
fs.ensureDirSync(logPath);
log.debug("Log directory:", logPath);
const configPath = path.join(getApplicationDataDirectory(), 'config.json');
var userConfig = new Config();
userConfig.load(configPath);
const ipcMain = electron.ipcMain;
var isShuttingDown = false;
function shutdown() {
log.debug("Normal shutdown (isShuttingDown: " + isShuttingDown + ")");
@ -232,27 +258,6 @@ function deleteOldFiles(directoryPath, maxAgeInSeconds, filenameRegex) {
}
}
var oldLogPath = path.join(getApplicationDataDirectory(), '/logs');
var logPath = path.join(getApplicationDataDirectory(true), '/logs');
if (oldLogPath != logPath) {
console.log("Migrating old logs from " + oldLogPath + " to " + logPath);
fs.copy(oldLogPath, logPath, err => {
if (err) {
console.error(err);
} else {
console.log('success!');
}
})
}
log.debug("Log directory:", logPath);
log.debug("Data directory:", getRootHifiDataDirectory());
const configPath = path.join(getApplicationDataDirectory(), 'config.json');
var userConfig = new Config();
userConfig.load(configPath);
// print out uncaught exceptions in the console
process.on('uncaughtException', function(err) {
log.error(err);