deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-02 22:02:19 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2143 from thelounge/xpaw/fix-2128

Browse source 
Do not crash when user file can not be read or written
This commit is contained in:
Pavel Djundik 2018-03-03 23:03:57 +02:00 committed by GitHub
parent 04046719c1 4b7a53c5e1
commit 68cc9a2e28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/clientManager.js
View file

@ -132,13 +132,7 @@ ClientManager.prototype.updateUser = function(name, opts, callback) {
const user = readUserConfig(name); const user = readUserConfig(name);
if (!user) { if (!user) {
log.error(`Tried to update invalid user ${colors.green(name)}. This is most likely a bug.`); return callback ? callback(true) : false;
if (callback) {
callback(true);
}
return false;
} }
const currentUser = JSON.stringify(user, null, "\t"); const currentUser = JSON.stringify(user, null, "\t");
@ -159,8 +153,6 @@ ClientManager.prototype.updateUser = function(name, opts, callback) {
if (callback) { if (callback) {
callback(e); callback(e);
} }
throw e;
} }
}; };
@ -185,6 +177,12 @@ function readUserConfig(name) {
return false; return false;
} }
try {
const data = fs.readFileSync(userPath, "utf-8"); const data = fs.readFileSync(userPath, "utf-8");
return JSON.parse(data); return JSON.parse(data);
} catch (e) {
log.error(`Failed to read user ${colors.bold(name)}: ${e}`);
}
return false;
} }