paulmataruso/zulip-desktop
1
0
Fork 0
mirror of https://github.com/zulip/zulip-desktop.git synced 2025-10-24 08:33:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

console: Fix errors where Logs dir can't be created.

Browse Source
This commit is contained in:
cPhost
2017-12-19 07:53:37 -05:00
parent dc6582fa82
commit c4a7264f34
5 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/renderer/js/console.js
View File

@@ -1,7 +1,9 @@
const NodeConsole = require('console').Console; const NodeConsole = require('console').Console;
const fs = require('fs'); const fs = require('fs');
const isDev = require('electron-is-dev'); const isDev = require('electron-is-dev');
const { initSetUp } = require('./utils/default-util');
initSetUp();
let app = null; let app = null;
if (process.type === 'renderer') { if (process.type === 'renderer') {
app = require('electron').remote.app; app = require('electron').remote.app;
@@ -54,7 +56,7 @@ class Console {
timestamp = getTimestamp; timestamp = getTimestamp;
} }
const fileStream = fs.createWriteStream(file); const fileStream = fs.createWriteStream(file, { flags: 'a' });
const nodeConsole = new NodeConsole(fileStream); const nodeConsole = new NodeConsole(fileStream);
this.nodeConsole = nodeConsole; this.nodeConsole = nodeConsole;
this.timestamp = timestamp; this.timestamp = timestamp;

2
app/renderer/js/main.js
View File

@@ -10,7 +10,6 @@ const WebView = require(__dirname + '/js/components/webview.js');
const ServerTab = require(__dirname + '/js/components/server-tab.js'); const ServerTab = require(__dirname + '/js/components/server-tab.js');
const FunctionalTab = require(__dirname + '/js/components/functional-tab.js'); const FunctionalTab = require(__dirname + '/js/components/functional-tab.js');
const ConfigUtil = require(__dirname + '/js/utils/config-util.js'); const ConfigUtil = require(__dirname + '/js/utils/config-util.js');
const { initSetUp } = require(__dirname + '/js/utils/default-util.js');
class ServerManagerView { class ServerManagerView {
constructor() { constructor() {
@@ -45,7 +44,6 @@ class ServerManagerView {
this.initActions(); this.initActions();
this.registerIpcs(); this.registerIpcs();
this.initDefaultSettings(); this.initDefaultSettings();
initSetUp();
}); });
} }

9
app/renderer/js/utils/config-util.js
View File

@@ -6,8 +6,9 @@ const process = require('process');
const JsonDB = require('node-json-db'); const JsonDB = require('node-json-db');
const Console = require('../console'); const Console = require('../console');
const console = new Console({ const logger = new Console({
file: 'config-util.log' file: 'config-util.log',
timestamp: true
}); });
let instance = null; let instance = null;
@@ -70,8 +71,8 @@ class ConfigUtil {
'Error saving settings', 'Error saving settings',
'We encountered error while saving current settings.' 'We encountered error while saving current settings.'
); );
console.error('Error while JSON parsing settings.json: '); logger.error('Error while JSON parsing settings.json: ');
console.error(err); logger.error(err);
} }
} }
this.db = new JsonDB(settingsJsonPath, true, true); this.db = new JsonDB(settingsJsonPath, true, true);

25
app/renderer/js/utils/default-util.js
View File

@@ -1,11 +1,28 @@
const fs = require('fs'); const fs = require('fs');
const { app } = require('electron').remote;
const logDir = `${app.getPath('userData')}/Logs/`; let app = null;
let setupCompleted = false;
if (process.type === 'renderer') {
app = require('electron').remote.app;
} else {
app = require('electron').app;
}
const zulipDir = app.getPath('userData');
const logDir = `${zulipDir}/Logs/`;
const initSetUp = () => { const initSetUp = () => {
if (!fs.existsSync(logDir)) { // if it is the first time the app is running
fs.mkdirSync(logDir); // create zulip dir in userData folder to
// avoid errors
if (!setupCompleted) {
if (!fs.existsSync(zulipDir)) {
fs.mkdirSync(zulipDir);
}
if (!fs.existsSync(logDir)) {
fs.mkdirSync(logDir);
}
setupCompleted = true;
} }
}; };

9
app/renderer/js/utils/domain-util.js
View File

@@ -7,8 +7,9 @@ const JsonDB = require('node-json-db');
const request = require('request'); const request = require('request');
const Console = require('../console'); const Console = require('../console');
const console = new Console({ const logger = new Console({
file: `domain-util.log` file: `domain-util.log`,
timestamp: true
}); });
let instance = null; let instance = null;
@@ -242,8 +243,8 @@ class DomainUtil {
'There seems to be error while saving new organisation, ' + 'There seems to be error while saving new organisation, ' +
'you may have to readd your previous organizations back.' 'you may have to readd your previous organizations back.'
); );
console.error('Error while JSON parsing domain.json: '); logger.error('Error while JSON parsing domain.json: ');
console.error(err); logger.error(err);
} }
} }
this.db = new JsonDB(domainJsonPath, true, true); this.db = new JsonDB(domainJsonPath, true, true);