deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2026-03-14 14:35:50 +01:00
Code Issues Projects Releases Wiki Activity

Precise user configuration reloading.

Browse source 
Previously when any user config file was changed all users would be reloaded. This could be very expensive on installations with thousands of users. Since this triggered when any file was changed it would trigger when any user connected which can be quite frequent.

As a side-effect this removes the debouncing. This means that user changes take effect instantly rather than after 1s.

Since there is no longer a 1s delay it is extra important that files are written safely. To this end the `thelounge add <user>` command was updated to write the user file atomically. (The update path already did this.)
This commit is contained in:
Kevin Cox 2025-08-23 16:59:30 -04:00
commit c20e9d2ef0
No known key found for this signature in database
GPG key ID: 9BB92CC1552E99AA
1 changed files with 25 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

51
server/clientManager.ts
View file

@ -86,39 +86,28 @@ class ClientManager {
}
autoloadUsers() {
fs.watch(
Config.getUsersPath(),
_.debounce(
() => {
const loaded = this.clients.map((c) => c.name);
const updatedUsers = this.getUsers();
fs.watch(Config.getUsersPath(), (_eventType, file) => {
if (!file.endsWith(".json")) {
return;
}
if (updatedUsers.length === 0) {
log.info(
`There are currently no users. Create one with ${colors.bold(
"thelounge add <name>"
)}.`
);
}
const name = file.slice(0, -5);
// Reload all users. Existing users will only have their passwords reloaded.
updatedUsers.forEach((name) => this.loadUser(name));
const userPath = Config.getUserConfigPath(name);
// Existing users removed since last time users were loaded
_.difference(loaded, updatedUsers).forEach((name) => {
const client = _.find(this.clients, {name});
if (fs.existsSync(userPath)) {
this.loadUser(name);
return;
}
if (client) {
client.quit(true);
this.clients = _.without(this.clients, client);
log.info(`User ${colors.bold(name)} disconnected and removed.`);
}
});
},
1000,
{maxWait: 10000}
)
);
const client = _.find(this.clients, {name});
if (client) {
client.quit(true);
this.clients = _.without(this.clients, client);
log.info(`User ${colors.bold(name)} disconnected and removed.`);
}
});
}
loadUser(name: string) {
@ -180,9 +169,11 @@ class ClientManager {
};
try {
fs.writeFileSync(userPath, JSON.stringify(user, null, "\t"), {
const tmpPath = userPath + ".tmp";
fs.writeFileSync(tmpPath, JSON.stringify(user, null, "\t"), {
mode: 0o600,
});
fs.renameSync(tmpPath, userPath);
} catch (e: any) {
log.error(`Failed to create user ${colors.green(name)} (${e})`);
throw e;