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

Some much needed logs and fixes

Browse Source
This commit is contained in:
Kwoth 2016-10-12 05:22:14 +02:00
parent a6f02249d6
commit 828053d299
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/NadekoBot/NadekoBot.cs
View File

@ -53,7 +53,7 @@ namespace NadekoBot
MessageCacheSize = 10, MessageCacheSize = 10,
LogLevel = LogSeverity.Warning, LogLevel = LogSeverity.Warning,
TotalShards = Credentials.TotalShards, TotalShards = Credentials.TotalShards,
ConnectionTimeout = 60000 ConnectionTimeout = int.MaxValue
}); });
//initialize Services //initialize Services

11
src/NadekoBot/ShardedDiscordClient.cs
View File

@ -8,12 +8,14 @@ using System.Threading.Tasks;
using Discord.API; using Discord.API;
using Discord.Logging; using Discord.Logging;
using System.IO; using System.IO;
using NLog;
namespace NadekoBot namespace NadekoBot
{ {
public class ShardedDiscordClient public class ShardedDiscordClient
{ {
private DiscordSocketConfig discordSocketConfig; private DiscordSocketConfig discordSocketConfig;
private Logger _log { get; }
public Func<IGuildUser, Task> UserJoined { get; internal set; } = delegate { return Task.CompletedTask; }; public Func<IGuildUser, Task> UserJoined { get; internal set; } = delegate { return Task.CompletedTask; };
public Func<IMessage, Task> MessageReceived { get; internal set; } = delegate { return Task.CompletedTask; }; public Func<IMessage, Task> MessageReceived { get; internal set; } = delegate { return Task.CompletedTask; };
@ -34,6 +36,7 @@ namespace NadekoBot
public ShardedDiscordClient (DiscordSocketConfig discordSocketConfig) public ShardedDiscordClient (DiscordSocketConfig discordSocketConfig)
{ {
_log = LogManager.GetCurrentClassLogger();
this.discordSocketConfig = discordSocketConfig; this.discordSocketConfig = discordSocketConfig;
var clientList = new List<DiscordSocketClient>(); var clientList = new List<DiscordSocketClient>();
@ -54,6 +57,8 @@ namespace NadekoBot
client.ChannelCreated += async arg => await ChannelCreated(arg); client.ChannelCreated += async arg => await ChannelCreated(arg);
client.ChannelDestroyed += async arg => await ChannelDestroyed(arg); client.ChannelDestroyed += async arg => await ChannelDestroyed(arg);
client.ChannelUpdated += async (arg1, arg2) => await ChannelUpdated(arg1, arg2); client.ChannelUpdated += async (arg1, arg2) => await ChannelUpdated(arg1, arg2);
_log.Info($"Shard #{i} initialized.");
} }
Clients = clientList.AsReadOnly(); Clients = clientList.AsReadOnly();
@ -72,12 +77,12 @@ namespace NadekoBot
Clients.Select(async c => await c.GetDMChannelAsync(channelId).ConfigureAwait(false)).FirstOrDefault(c => c != null); Clients.Select(async c => await c.GetDMChannelAsync(channelId).ConfigureAwait(false)).FirstOrDefault(c => c != null);
internal Task LoginAsync(TokenType tokenType, string token) => internal Task LoginAsync(TokenType tokenType, string token) =>
Task.WhenAll(Clients.Select(c => c.LoginAsync(tokenType, token))); Task.WhenAll(Clients.Select(async c => { await c.LoginAsync(tokenType, token); _log.Info($"Shard #{c.ShardId} logged in."); }));
internal Task ConnectAsync() => internal Task ConnectAsync() =>
Task.WhenAll(Clients.Select(c => c.ConnectAsync())); Task.WhenAll(Clients.Select(async c => { await c.ConnectAsync(); _log.Info($"Shard #{c.ShardId} connected."); }));
internal Task DownloadAllUsersAsync() => internal Task DownloadAllUsersAsync() =>
Task.WhenAll(Clients.Select(c => c.DownloadAllUsersAsync())); Task.WhenAll(Clients.Select(async c => { await c.DownloadAllUsersAsync(); _log.Info($"Shard #{c.ShardId} downloaded {c.GetGuilds().Sum(g => g.GetUsers().Count)} users."); }));
} }
} }