mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Refactor configuration out into reusable files

Browse source
This commit is contained in:
David Balatero 2017-06-21 18:04:19 -07:00 • committed by Scott Nonnenberg
parent ed831dacd0
commit 5e5ca80a6e
No known key found for this signature in database
GPG key ID: A4931C09644C654B
4 changed files with 84 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/autoupdate.js
View file

@ -1,5 +1,6 @@
const autoUpdater = require('electron-updater').autoUpdater
const { dialog } = require('electron');
const config = require('./config');
const windowState = require('./window_state');
@ -9,7 +10,7 @@ const autoUpdaterInterval = hour * 1000;
const RESTART_BUTTON = 0;
const LATER_BUTTON = 1;
function autoUpdateDisabled(config) {
function autoUpdateDisabled() {
return process.mas || config.get('disableAutoUpdate');
}
@ -45,8 +46,8 @@ function onError(error) {
console.log("Got an error while updating: ", error.stack);
}
function initializeAutoUpdater(config, localeMessages) {
if (autoUpdateDisabled(config)) {
function initializeAutoUpdater(localeMessages) {
if (autoUpdateDisabled()) {
return;
}

41
app/config.js Normal file
View file

@ -0,0 +1,41 @@
const fs = require('fs');
const path = require('path');
console.log('reading package.json');
const jsonFile = fs.readFileSync(path.join(__dirname, '..', 'package.json'));
const package_json = JSON.parse(jsonFile, 'utf-8');
const environment = package_json.environment || process.env.NODE_ENV || 'development';
console.log('configuring');
// Set environment vars to configure node-config before requiring it
process.env.NODE_ENV = environment;
process.env.NODE_CONFIG_DIR = path.join(__dirname, '..', 'config');
if (environment === 'production') {
// harden production config against the local env
process.env.NODE_CONFIG = '';
process.env.NODE_CONFIG_STRICT_MODE = true;
process.env.HOSTNAME = '';
process.env.NODE_APP_INSTANCE = '';
process.env.ALLOW_CONFIG_MUTATIONS = '';
process.env.SUPPRESS_NO_CONFIG_WARNING = '';
}
const config = require('config');
config.environment = environment;
// Log resulting env vars in use by config
[
'NODE_ENV',
'NODE_CONFIG_DIR',
'NODE_CONFIG',
'ALLOW_CONFIG_MUTATIONS',
'HOSTNAME',
'NODE_APP_INSTANCE',
'SUPPRESS_NO_CONFIG_WARNING'
].forEach(function(s) {
console.log(s + ' ' + config.util.getEnv(s));
});
module.exports = config;

22
app/user_config.js Normal file
View file

@ -0,0 +1,22 @@
const app = require('electron').app;
const path = require('path');
const ElectronConfig = require('electron-config');
const config = require('./config');
// use a separate data directory for development
if (config.has('storageProfile')) {
const userData = path.join(
app.getPath('appData'),
'Signal-' + config.get('storageProfile')
);
app.setPath('userData', userData);
}
console.log('userData ' + app.getPath('userData'));
// this needs to be below our update to the appData path
const userConfig = new ElectronConfig();
module.exports = userConfig;