nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-21 21:15:10 -05:00
Code

Use correct sentry integration package. Fixes #669 (#670)

Browse Source
This commit is contained in:
David Roth 2020-03-16 13:25:46 +01:00 committed by GitHub
parent 287054c6e7
commit b7b06d77df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Core.csproj
View File

@ -45,7 +45,7 @@
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" /> <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" /> <PackageReference Include="Serilog.Extensions.Logging.File" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.AzureDocumentDB" Version="3.8.0" /> <PackageReference Include="Serilog.Sinks.AzureDocumentDB" Version="3.8.0" />
<PackageReference Include="Serilog.Sinks.Sentry.AspNetCore" Version="2.4.2" /> <PackageReference Include="Sentry.Serilog" Version="2.1.0" />
<PackageReference Include="IdentityServer4" Version="3.1.2" /> <PackageReference Include="IdentityServer4" Version="3.1.2" />
<PackageReference Include="Dapper" Version="2.0.30" /> <PackageReference Include="Dapper" Version="2.0.30" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

8
src/Core/Utilities/LoggerFactoryExtensions.cs
View File

@ -22,10 +22,6 @@ namespace Bit.Core.Utilities
return; return;
} }
if(CoreHelpers.SettingHasValue(globalSettings?.Sentry.Dsn))
{
appBuilder.AddSentryContext();
}
applicationLifetime.ApplicationStopped.Register(Log.CloseAndFlush); applicationLifetime.ApplicationStopped.Register(Log.CloseAndFlush);
} }
@ -72,9 +68,7 @@ namespace Bit.Core.Utilities
{ {
config.WriteTo.Sentry(globalSettings.Sentry.Dsn) config.WriteTo.Sentry(globalSettings.Sentry.Dsn)
.Enrich.FromLogContext() .Enrich.FromLogContext()
.Enrich.WithProperty("Project", globalSettings.ProjectName) .Enrich.WithProperty("Project", globalSettings.ProjectName);
.Destructure.With<HttpContextDestructingPolicy>()
.Filter.ByExcluding(e => e.Exception?.CheckIfCaptured() == true);
} }
else if(CoreHelpers.SettingHasValue(globalSettings.LogDirectory)) else if(CoreHelpers.SettingHasValue(globalSettings.LogDirectory))
{ {