From 3ea265f2332d805e46cb1a1d163a811ef1c1c963 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 5 Jun 2018 17:00:52 -0700
Subject: [PATCH] Ensure hifi roaming directory is created

---
 server-console/src/main.js | 58 ++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/server-console/src/main.js b/server-console/src/main.js
index ce2ae34ec3..ac4b0411e7 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -115,32 +115,43 @@ const UPDATER_LOCK_FULL_PATH = getRootHifiDataDirectory() + "/" + UPDATER_LOCK_F
 
 // Configure log
 global.log = require('electron-log');
-const oldLogPath = path.join(getApplicationDataDirectory(), '/logs');
-const logPath = path.join(getApplicationDataDirectory(true), '/logs');
 const oldLogFile = path.join(getApplicationDataDirectory(), '/log.txt');
 const logFile = path.join(getApplicationDataDirectory(true), '/log.txt');
-
-if (oldLogFile != logFile && fs.pathExistsSync(oldLogFile)) {
-    fs.moveSync(oldLogFile, logFile);
-    fs.removeSync(oldLogFile);
+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;
 
-if (oldLogPath != logPath && fs.pathExistsSync(oldLogPath)) {
-    fs.ensureDirSync(logPath);
-    fs.moveSync(oldLogPath, logPath);
-    fs.removeSync(oldLogPath);
+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);
 
-log.debug("build info", buildInfo);
-log.debug("Root hifi data directory is: ", getRootHifiDataDirectory());
+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 +  ")");
@@ -247,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);