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

Add an assertion when updating conversations; update cleanData

Browse source
This commit is contained in:
Evan Hahn 2021-02-04 13:54:03 -06:00 • committed by GitHub
parent 73a304faba
commit bc37b5c907
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 749 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

21
app/config.js
View file

@ -3,21 +3,25 @@
const path = require('path');
const { app } = require('electron');
let environment;
const {
Environment,
getEnvironment,
setEnvironment,
parseEnvironment,
} = require('../ts/environment');
// In production mode, NODE_ENV cannot be customized by the user
if (!app.isPackaged) {
environment = process.env.NODE_ENV || 'development';
if (app.isPackaged) {
setEnvironment(Environment.Production);
} else {
environment = 'production';
setEnvironment(parseEnvironment(process.env.NODE_ENV || 'development'));
}
// Set environment vars to configure node-config before requiring it
process.env.NODE_ENV = environment;
process.env.NODE_ENV = getEnvironment();
process.env.NODE_CONFIG_DIR = path.join(__dirname, '..', 'config');
if (environment === 'production') {
if (getEnvironment() === Environment.Production) {
// harden production config against the local env
process.env.NODE_CONFIG = '';
process.env.NODE_CONFIG_STRICT_MODE = true;
@ -30,9 +34,10 @@ if (environment === 'production') {
}
// We load config after we've made our modifications to NODE_ENV
// eslint-disable-next-line import/order
const config = require('config');
config.environment = environment;
config.environment = getEnvironment();
config.enableHttp = process.env.SIGNAL_ENABLE_HTTP;
// Log resulting env vars in use by config