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

Merge pull request #3483 from thelounge/xpaw/improve-user-startup

Browse source 
Improvements to network connections on startup
This commit is contained in:
Pavel Djundik 2019-11-01 13:26:24 +02:00 committed by GitHub
parent eb971a7d23 a0c2495c42
commit fb250682a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/client.js
View file

@ -61,7 +61,6 @@ function Client(manager, name, config = {}) {
}); });
const client = this; const client = this;
let delay = 0;
if (!Helper.config.public && client.config.log) { if (!Helper.config.public && client.config.log) {
if (Helper.config.messageStorage.includes("sqlite")) { if (Helper.config.messageStorage.includes("sqlite")) {
@ -77,12 +76,11 @@ function Client(manager, name, config = {}) {
} }
} }
(client.config.networks || []).forEach((n) => { (client.config.networks || []).forEach((network) => client.connect(network, true));
setTimeout(function() {
client.connect(n); // Networks are stored directly in the client object
}, delay); // We don't need to keep it in the config object
delay += 1000; delete client.config.networks;
});
if (typeof client.config.sessions !== "object") { if (typeof client.config.sessions !== "object") {
client.config.sessions = {}; client.config.sessions = {};
@ -106,6 +104,21 @@ function Client(manager, name, config = {}) {
if (client.name) { if (client.name) {
log.info(`User ${colors.bold(client.name)} loaded`); log.info(`User ${colors.bold(client.name)} loaded`);
// Networks are created instantly, but to reduce server load on startup
// We randomize the IRC connections and channel log loading
let delay = manager.clients.length * 500;
client.networks.forEach((network) => {
setTimeout(() => {
network.channels.forEach((channel) => channel.loadMessages(client, network));
if (!network.userDisconnected && network.irc) {
network.irc.connect();
}
}, delay);
delay += 1000 + Math.floor(Math.random() * 1000);
});
} }
} }
@ -143,7 +156,7 @@ Client.prototype.find = function(channelId) {
return false; return false;
}; };
Client.prototype.connect = function(args) { Client.prototype.connect = function(args, isStartup = false) {
const client = this; const client = this;
let channels = []; let channels = [];
@ -240,13 +253,14 @@ Client.prototype.connect = function(args) {
}), }),
true true
); );
} else { } else if (!isStartup) {
network.irc.connect(); network.irc.connect();
} }
client.save(); if (!isStartup) {
client.save();
channels.forEach((channel) => channel.loadMessages(client, network)); channels.forEach((channel) => channel.loadMessages(client, network));
}
}; };
Client.prototype.generateToken = function(callback) { Client.prototype.generateToken = function(callback) {

12
test/tests/customhighlights.js
View file

@ -10,9 +10,15 @@ describe("Custom highlights", function() {
let userLoadedLog = ""; let userLoadedLog = "";
stub(log, "info").callsFake(TestUtil.sanitizeLog((str) => (userLoadedLog += str))); stub(log, "info").callsFake(TestUtil.sanitizeLog((str) => (userLoadedLog += str)));
const client = new Client({}, "test", { const client = new Client(
clientSettings: {highlights: "foo, @all, sp ace , 고"}, {
}); clients: [],
},
"test",
{
clientSettings: {highlights: "foo, @all, sp ace , 고"},
}
);
log.info.restore(); log.info.restore();
expect(userLoadedLog).to.equal("User test loaded\n"); expect(userLoadedLog).to.equal("User test loaded\n");