mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

improvements to sharded client

Browse Source
This commit is contained in:
Kwoth
2016-12-29 06:56:16 +01:00
parent b215710915
commit f25b324882
1 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/NadekoBot/ShardedDiscordClient.cs
View File

@@ -5,32 +5,36 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using NLog; using NLog;
using System.Diagnostics;
namespace NadekoBot namespace NadekoBot
{ {
public class ShardedDiscordClient public class ShardedDiscordClient
{ {
private DiscordSocketConfig discordSocketConfig; private DiscordSocketConfig discordSocketConfig;
private Logger _log { get; } private Logger _log { get; }
public event Action<IGuildUser> UserJoined = delegate { }; public event Action<IGuildUser> UserJoined = delegate { };
public event Action<IMessage> MessageReceived = delegate { }; public event Action<IMessage> MessageReceived = delegate { };
public event Action<IGuildUser> UserLeft = delegate { }; public event Action<IGuildUser> UserLeft = delegate { };
public event Action<IGuildUser, IGuildUser> UserUpdated = delegate { }; public event Action<IGuildUser, IGuildUser> UserUpdated = delegate { };
public event Action<Optional<IMessage>, IMessage> MessageUpdated = delegate { }; public event Action<Optional<IMessage>, IMessage> MessageUpdated = delegate { };
public event Action<ulong, Optional<IMessage>> MessageDeleted = delegate { }; public event Action<ulong, Optional<IMessage>> MessageDeleted = delegate { };
public event Action<IUser, IGuild> UserBanned = delegate { }; public event Action<IUser, IGuild> UserBanned = delegate { };
public event Action<IUser, IGuild> UserUnbanned = delegate { }; public event Action<IUser, IGuild> UserUnbanned = delegate { };
public event Action<IGuildUser, IPresence, IPresence> UserPresenceUpdated = delegate { }; public event Action<IGuildUser, IPresence, IPresence> UserPresenceUpdated = delegate { };
public event Action<IUser, IVoiceState, IVoiceState> UserVoiceStateUpdated = delegate { }; public event Action<IUser, IVoiceState, IVoiceState> UserVoiceStateUpdated = delegate { };
public event Action<IChannel> ChannelCreated = delegate { }; public event Action<IChannel> ChannelCreated = delegate { };
public event Action<IChannel> ChannelDestroyed = delegate { }; public event Action<IChannel> ChannelDestroyed = delegate { };
public event Action<IChannel, IChannel> ChannelUpdated = delegate { }; public event Action<IChannel, IChannel> ChannelUpdated = delegate { };
public event Action<Exception> Disconnected = delegate { }; public event Action<Exception> Disconnected = delegate { };
private uint _connectedCount = 0;
private uint _downloadedCount = 0;
private IReadOnlyList<DiscordSocketClient> Clients { get; } private IReadOnlyList<DiscordSocketClient> Clients { get; }
public ShardedDiscordClient (DiscordSocketConfig discordSocketConfig) public ShardedDiscordClient(DiscordSocketConfig discordSocketConfig)
{ {
_log = LogManager.GetCurrentClassLogger(); _log = LogManager.GetCurrentClassLogger();
this.discordSocketConfig = discordSocketConfig; this.discordSocketConfig = discordSocketConfig;
@@ -87,14 +91,15 @@ namespace NadekoBot
internal Task LoginAsync(TokenType tokenType, string token) => internal Task LoginAsync(TokenType tokenType, string token) =>
Task.WhenAll(Clients.Select(async c => { await c.LoginAsync(tokenType, token).ConfigureAwait(false); _log.Info($"Shard #{c.ShardId} logged in."); })); Task.WhenAll(Clients.Select(async c => { await c.LoginAsync(tokenType, token).ConfigureAwait(false); _log.Info($"Shard #{c.ShardId} logged in."); }));
internal async Task ConnectAsync() internal Task ConnectAsync() =>
{ Task.WhenAll(Clients.Select(async c =>
foreach (var c in Clients)
{ {
try try
{ {
var sw = Stopwatch.StartNew();
await c.ConnectAsync().ConfigureAwait(false); await c.ConnectAsync().ConfigureAwait(false);
_log.Info($"Shard #{c.ShardId} connected."); sw.Stop();
_log.Info($"Shard #{c.ShardId} connected after {sw.Elapsed.TotalSeconds}s ({++_connectedCount}/{Clients.Count})");
} }
catch catch
{ {
@@ -106,11 +111,16 @@ namespace NadekoBot
_log.Error(ex2); _log.Error(ex2);
} }
} }
} }));
}
internal Task DownloadAllUsersAsync() => internal Task DownloadAllUsersAsync() =>
Task.WhenAll(Clients.Select(async c => { await c.DownloadAllUsersAsync().ConfigureAwait(false); _log.Info($"Shard #{c.ShardId} downloaded {c.GetGuilds().Sum(g => g.GetUsers().Count)} users."); })); Task.WhenAll(Clients.Select(async c =>
{
var sw = Stopwatch.StartNew();
await c.DownloadAllUsersAsync().ConfigureAwait(false);
sw.Stop();
_log.Info($"Shard #{c.ShardId} downloaded {c.GetGuilds().Sum(g => g.GetUsers().Count)} users after {sw.Elapsed.TotalSeconds}s ({++_downloadedCount}/{Clients.Count}).");
}));
public async Task SetGame(string game) public async Task SetGame(string game)
{ {
@@ -122,7 +132,7 @@ namespace NadekoBot
{ {
await Task.WhenAll((await GetAllCurrentUsersAsync()) await Task.WhenAll((await GetAllCurrentUsersAsync())
.Select(u => u.ModifyStatusAsync(ms => ms.Game = new Discord.Game(name, url, StreamType.Twitch)))); .Select(u => u.ModifyStatusAsync(ms => ms.Game = new Discord.Game(name, url, StreamType.Twitch))));
} }
} }
} }