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

Remove Bugsnag

Browse source
This commit is contained in:
Runebaas 2019-03-02 00:50:54 -05:00
parent 16f70d52ce
commit 2b90358ca5
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
2 changed files with 10 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Geekbot.net/Geekbot.net.csproj
View file

@ -19,8 +19,6 @@
<Optimize>true</Optimize> <Optimize>true</Optimize>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Bugsnag" Version="2.2.0" />
<PackageReference Include="Bugsnag.AspNet.Core" Version="2.2.0" />
<PackageReference Include="CommandLineParser" Version="2.4.3" /> <PackageReference Include="CommandLineParser" Version="2.4.3" />
<PackageReference Include="Discord.Net"> <PackageReference Include="Discord.Net">
<Version>2.0.1</Version> <Version>2.0.1</Version>

67
Geekbot.net/Lib/ErrorHandling/ErrorHandler.cs
View file

@ -1,9 +1,6 @@
using System; using System;
using System.Collections.Generic;
using System.Net; using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
using Bugsnag;
using Bugsnag.Payload;
using Discord.Commands; using Discord.Commands;
using Discord.Net; using Discord.Net;
using Geekbot.net.Lib.GlobalSettings; using Geekbot.net.Lib.GlobalSettings;
@ -21,7 +18,6 @@ namespace Geekbot.net.Lib.ErrorHandling
private readonly ITranslationHandler _translation; private readonly ITranslationHandler _translation;
private readonly IRavenClient _raven; private readonly IRavenClient _raven;
private readonly bool _errorsInChat; private readonly bool _errorsInChat;
private readonly IClient _bugsnag;
public ErrorHandler(IGeekbotLogger logger, ITranslationHandler translation, IGlobalSettings globalSettings, bool errorsInChat) public ErrorHandler(IGeekbotLogger logger, ITranslationHandler translation, IGlobalSettings globalSettings, bool errorsInChat)
{ {
@ -39,21 +35,6 @@ namespace Geekbot.net.Lib.ErrorHandling
{ {
_raven = null; _raven = null;
} }
var bugsnagApiKey = globalSettings.GetKey("BugsnagApiKey");
if (!string.IsNullOrEmpty(bugsnagApiKey))
{
_bugsnag = new Bugsnag.Client(new Bugsnag.Configuration
{
ApiKey = bugsnagApiKey,
AppVersion = Constants.BotVersion()
});
_logger.Information(LogSource.Geekbot, "Command Errors will be logged to Bugsnag");
}
else
{
_bugsnag = null;
}
} }
public async Task HandleCommandException(Exception e, ICommandContext context, string errorMessage = "def") public async Task HandleCommandException(Exception e, ICommandContext context, string errorMessage = "def")
@ -109,46 +90,18 @@ namespace Geekbot.net.Lib.ErrorHandling
private void ReportExternal(Exception e, MessageDto errorObj) private void ReportExternal(Exception e, MessageDto errorObj)
{ {
if (_raven != null) if (_raven == null) return;
var sentryEvent = new SentryEvent(e)
{ {
var sentryEvent = new SentryEvent(e) Tags =
{ {
Tags = ["discord_server"] = errorObj.Guild.Name,
{ ["discord_user"] = errorObj.User.Name
["discord_server"] = errorObj.Guild.Name, },
["discord_user"] = errorObj.User.Name Message = errorObj.Message.Content,
}, Extra = errorObj
Message = errorObj.Message.Content, };
Extra = errorObj _raven.Capture(sentryEvent);
};
_raven.Capture(sentryEvent);
}
_bugsnag?.Notify(e, (report) =>
{
report.Event.Metadata.Add("Discord Location", new Dictionary<string, string>
{
{"Guild Name", errorObj.Guild.Name},
{"Guild Id", errorObj.Guild.Id},
{"Channel Name", errorObj.Channel.Name},
{"Channel Id", errorObj.Channel.Id}
});
report.Event.Metadata.Add("Message Info", new Dictionary<string, string>
{
{"Content", errorObj.Message.Content},
{"Id", errorObj.Message.Id},
{"Attachments", errorObj.Message.Attachments.ToString()},
{"ChannelMentions", errorObj.Message.ChannelMentions.ToString()},
{"UserMentions", errorObj.Message.UserMentions.ToString()},
{"RoleMentions", errorObj.Message.RoleMentions.ToString()},
});
report.Event.Severity = Severity.Error;
report.Event.User = new User
{
Id = errorObj.User.Id,
Name = errorObj.User.Name
};
});
} }
} }
} }