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

Be resilient to malformed ephemeral.json

Browse source
This commit is contained in:
Scott Nonnenberg 2018-11-01 09:34:24 -07:00
parent 41dd78c073
commit f11dd18536
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/base_config.js
View file

@ -8,7 +8,8 @@ module.exports = {
start, start,
}; };
function start(name, targetPath) { function start(name, targetPath, options = {}) {
const { allowMalformedOnStartup } = options;
let cachedValue = null; let cachedValue = null;
try { try {
@ -23,7 +24,7 @@ function start(name, targetPath) {
cachedValue = Object.create(null); cachedValue = Object.create(null);
} }
} catch (error) { } catch (error) {
if (error.code !== 'ENOENT') { if (!allowMalformedOnStartup && error.code !== 'ENOENT') {
throw error; throw error;
} }

4
app/ephemeral_config.js
View file

@ -7,6 +7,8 @@ const { start } = require('./base_config');
const userDataPath = app.getPath('userData'); const userDataPath = app.getPath('userData');
const targetPath = path.join(userDataPath, 'ephemeral.json'); const targetPath = path.join(userDataPath, 'ephemeral.json');
const ephemeralConfig = start('ephemeral', targetPath); const ephemeralConfig = start('ephemeral', targetPath, {
allowMalformedOnStartup: true,
});
module.exports = ephemeralConfig; module.exports = ephemeralConfig;