zinface
/
Signal-Desktop
mirror of https://github.com/signalapp/Signal-Desktop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Be resilient to malformed ephemeral.json

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
Show Stats 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,
};
function start(name, targetPath) {
function start(name, targetPath, options = {}) {
const { allowMalformedOnStartup } = options;
let cachedValue = null;
try {
@ -23,7 +24,7 @@ function start(name, targetPath) {
cachedValue = Object.create(null);
}
} catch (error) {
if (error.code !== 'ENOENT') {
if (!allowMalformedOnStartup && error.code !== 'ENOENT') {
throw error;
}

4
app/ephemeral_config.js
View File

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