github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added DiscordConfig.LogEvents to control built-in event logging

Browse Source
This commit is contained in:
RogueException
2015-12-25 15:21:31 -04:00
parent 3c57ab3261
commit 0fd946152c
2 changed files with 53 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/Discord.Net/DiscordClient.cs
View File

@@ -485,13 +485,17 @@ namespace Discord
{
var server = AddServer(data.Id);
server.Update(data);
if (data.Unavailable != false)
if (Config.LogEvents)
{
Logger.Info($"Server Created: {server.Name}");
OnJoinedServer(server);
if (data.Unavailable != false)
Logger.Info($"Server Created: {server.Name}");
else
Logger.Info($"Server Available: {server.Name}");
}
else
Logger.Info($"Server Available: {server.Name}");
if (data.Unavailable != false)
OnJoinedServer(server);
OnServerAvailable(server);
}
}
@@ -503,7 +507,8 @@ namespace Discord
if (server != null)
{
server.Update(data);
Logger.Info($"Server Updated: {server.Name}");
if (Config.LogEvents)
Logger.Info($"Server Updated: {server.Name}");
OnServerUpdated(server);
}
}
@@ -514,10 +519,13 @@ namespace Discord
Server server = RemoveServer(data.Id);
if (server != null)
{
if (data.Unavailable != true)
Logger.Info($"Server Destroyed: {server.Name}");
else
Logger.Info($"Server Unavailable: {server.Name}");
if (Config.LogEvents)
{
if (data.Unavailable != true)
Logger.Info($"Server Destroyed: {server.Name}");
else
Logger.Info($"Server Unavailable: {server.Name}");
}
OnServerUnavailable(server);
if (data.Unavailable != true)
@@ -543,7 +551,8 @@ namespace Discord
if (channel != null)
{
channel.Update(data);
Logger.Info($"Channel Created: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
if (Config.LogEvents)
Logger.Info($"Channel Created: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
OnChannelCreated(channel);
}
}
@@ -555,7 +564,8 @@ namespace Discord
if (channel != null)
{
channel.Update(data);
Logger.Info($"Channel Updated: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
if (Config.LogEvents)
Logger.Info($"Channel Updated: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
OnChannelUpdated(channel);
}
}
@@ -566,7 +576,8 @@ namespace Discord
var channel = RemoveChannel(data.Id);
if (channel != null)
{
Logger.Info($"Channel Destroyed: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
if (Config.LogEvents)
Logger.Info($"Channel Destroyed: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
OnChannelDestroyed(channel);
}
}
@@ -582,7 +593,8 @@ namespace Discord
var user = server.AddUser(data.User.Id);
user.Update(data);
user.UpdateActivity();
Logger.Info($"User Joined: {server.Name}/{user.Name}");
if (Config.LogEvents)
Logger.Info($"User Joined: {server.Name}/{user.Name}");
OnUserJoined(user);
}
}
@@ -597,7 +609,8 @@ namespace Discord
if (user != null)
{
user.Update(data);
Logger.Info($"User Updated: {server.Name}/{user.Name}");
if (Config.LogEvents)
Logger.Info($"User Updated: {server.Name}/{user.Name}");
OnUserUpdated(user);
}
}
@@ -612,7 +625,8 @@ namespace Discord
var user = server.RemoveUser(data.User.Id);
if (user != null)
{
Logger.Info($"User Left: {server.Name}/{user.Name}");
if (Config.LogEvents)
Logger.Info($"User Left: {server.Name}/{user.Name}");
OnUserLeft(user);
}
}
@@ -643,7 +657,8 @@ namespace Discord
{
var role = server.AddRole(data.Data.Id);
role.Update(data.Data);
Logger.Info($"Role Created: {server.Name}/{role.Name}");
if (Config.LogEvents)
Logger.Info($"Role Created: {server.Name}/{role.Name}");
OnRoleUpdated(role);
}
}
@@ -658,7 +673,8 @@ namespace Discord
if (role != null)
{
role.Update(data.Data);
Logger.Info($"Role Updated: {server.Name}/{role.Name}");
if (Config.LogEvents)
Logger.Info($"Role Updated: {server.Name}/{role.Name}");
OnRoleUpdated(role);
}
}
@@ -673,7 +689,8 @@ namespace Discord
var role = server.RemoveRole(data.RoleId);
if (role != null)
{
Logger.Info($"Role Deleted: {server.Name}/{role.Name}");
if (Config.LogEvents)
Logger.Info($"Role Deleted: {server.Name}/{role.Name}");
OnRoleDeleted(role);
}
}
@@ -688,7 +705,8 @@ namespace Discord
if (server != null)
{
server.AddBan(data.UserId);
Logger.Info($"User Banned: {server.Name}/{data.UserId}");
if (Config.LogEvents)
Logger.Info($"User Banned: {server.Name}/{data.UserId}");
OnUserBanned(server, data.UserId);
}
}
@@ -701,7 +719,8 @@ namespace Discord
{
if (server.RemoveBan(data.UserId))
{
Logger.Info($"User Unbanned: {server.Name}/{data.UserId}");
if (Config.LogEvents)
Logger.Info($"User Unbanned: {server.Name}/{data.UserId}");
OnUserUnbanned(server, data.UserId);
}
}
@@ -745,7 +764,8 @@ namespace Discord
}*/
msg.State = MessageState.Normal;
Logger.Verbose($"Message Received: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
if (Config.LogEvents)
Logger.Verbose($"Message Received: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
OnMessageReceived(msg);
}
}
@@ -761,7 +781,8 @@ namespace Discord
{
msg.Update(data);
msg.State = MessageState.Normal;
Logger.Info($"Message Update: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
if (Config.LogEvents)
Logger.Info($"Message Update: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
OnMessageUpdated(msg);
}
}
@@ -776,7 +797,8 @@ namespace Discord
var msg = channel.RemoveMessage(data.Id);
if (msg != null)
{
Logger.Info($"Message Deleted: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
if (Config.LogEvents)
Logger.Info($"Message Deleted: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
OnMessageDeleted(msg);
}
}
@@ -791,7 +813,8 @@ namespace Discord
var msg = channel.GetMessage(data.MessageId);
if (msg != null)
{
Logger.Verbose($"Message Ack: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
if (Config.LogEvents)
Logger.Verbose($"Message Ack: {channel.Server?.Name ?? "[Private]"}/{channel.Name}");
OnMessageAcknowledged(msg);
}
}
@@ -877,7 +900,8 @@ namespace Discord
PrivateUser.Update(data);
foreach (var server in _servers)
server.Value.CurrentUser.Update(data);
Logger.Info("Profile Updated");
if (Config.LogEvents)
Logger.Info("Profile Updated");
OnProfileUpdated(CurrentUser);
}
}

3
src/Discord.Net/DiscordConfig.cs
View File

@@ -59,6 +59,9 @@ namespace Discord
/// <summary> Specifies the minimum log level severity that will be sent to the LogMessage event. Warning: setting this to debug will really hurt performance but should help investigate any internal issues. </summary>
public LogSeverity LogLevel { get { return _logLevel; } set { SetValue(ref _logLevel, value); } }
private LogSeverity _logLevel = LogSeverity.Info;
/// <summary> Enables or disables the default event logger. </summary>
public bool LogEvents { get { return _logEvents; } set { SetValue(ref _logEvents, value); } }
private bool _logEvents = true;
/// <summary> User Agent string to use when connecting to Discord. </summary>
[JsonIgnore]