daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Replace all ocurences of the Serilog with GeekbotLogger

Browse source
This commit is contained in:
runebaas 2018-01-20 01:38:49 +01:00
parent 82b2b4c815
commit 07ca1e1548
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
13 changed files with 105 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Geekbot.net/Commands/Overwatch.cs
View file

@ -14,13 +14,11 @@ namespace Geekbot.net.Commands
public class Overwatch : ModuleBase
{
private readonly IErrorHandler _errorHandler;
private readonly ILogger _logger;
private readonly IUserRepository _userRepository;
public Overwatch(IErrorHandler errorHandler, ILogger logger, IDatabase redis, IUserRepository userRepository)
public Overwatch(IErrorHandler errorHandler, IDatabase redis, IUserRepository userRepository)
{
_errorHandler = errorHandler;
_logger = logger;
_userRepository = userRepository;
}
@ -117,7 +115,6 @@ namespace Geekbot.net.Commands
{
var player = await owClient.GetPlayerAsync(battletag);
if (player.Username == null) return null;
_logger.Debug($"[OW] Username = {player.Username}");
var eb = new EmbedBuilder();
eb.WithAuthor(new EmbedAuthorBuilder()
.WithIconUrl(player.ProfilePortraitUrl)

12
Geekbot.net/Commands/Owner.cs
View file

@ -15,11 +15,11 @@ namespace Geekbot.net.Commands
{
private readonly DiscordSocketClient _client;
private readonly IErrorHandler _errorHandler;
private readonly ILogger _logger;
private readonly IGeekbotLogger _logger;
private readonly IDatabase _redis;
private readonly IUserRepository _userRepository;
public Owner(IDatabase redis, DiscordSocketClient client, ILogger logger, IUserRepository userRepositry,
public Owner(IDatabase redis, DiscordSocketClient client, IGeekbotLogger logger, IUserRepository userRepositry,
IErrorHandler errorHandler)
{
_redis = redis;
@ -61,7 +61,7 @@ namespace Geekbot.net.Commands
_redis.StringSet("Game", key);
await _client.SetGameAsync(key);
_logger.Information($"[Geekbot] Changed game to {key}");
_logger.Information("Geekbot", $"Changed game to {key}");
await ReplyAsync($"Now Playing {key}");
}
@ -91,11 +91,11 @@ namespace Geekbot.net.Commands
var failed = 0;
try
{
_logger.Warning("[UserRepository] Populating User Repositry");
_logger.Warning("UserRepository", "Populating User Repositry");
await ReplyAsync("Starting Population of User Repository");
foreach (var guild in _client.Guilds)
{
_logger.Information($"[UserRepository] Populating users from {guild.Name}");
_logger.Information("UserRepository", $"Populating users from {guild.Name}");
foreach (var user in guild.Users)
{
var succeded = await _userRepository.Update(user);
@ -103,7 +103,7 @@ namespace Geekbot.net.Commands
}
}
_logger.Warning("[UserRepository] Finished Updating User Repositry");
_logger.Warning("UserRepository", "Finished Updating User Repositry");
await ReplyAsync(
$"Successfully Populated User Repository with {success} Users in {_client.Guilds.Count} Guilds (Failed: {failed})");
}

6
Geekbot.net/Commands/Rank.cs
View file

@ -15,12 +15,12 @@ namespace Geekbot.net.Commands
{
private readonly IEmojiConverter _emojiConverter;
private readonly IErrorHandler _errorHandler;
private readonly ILogger _logger;
private readonly IGeekbotLogger _logger;
private readonly IDatabase _redis;
private readonly IUserRepository _userRepository;
private readonly DiscordSocketClient _client;
public Rank(IDatabase redis, IErrorHandler errorHandler, ILogger logger, IUserRepository userRepository,
public Rank(IDatabase redis, IErrorHandler errorHandler, IGeekbotLogger logger, IUserRepository userRepository,
IEmojiConverter emojiConverter, DiscordSocketClient client)
{
_redis = redis;
@ -91,7 +91,7 @@ namespace Geekbot.net.Commands
}
catch (Exception e)
{
_logger.Warning(e, $"Could not retrieve user {user.Name}");
_logger.Warning("Geekbot", $"Could not retrieve user {user.Name}", e);
}
}