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

bypass log filter on migrator

Browse Source
This commit is contained in:
Kyle Spearrin 2019-03-25 15:20:54 -04:00
parent d8361ff1d6
commit 1bd4d39136
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/Migrator/DbMigrator.cs
View File

@ -2,6 +2,7 @@
using System.Data.SqlClient; using System.Data.SqlClient;
using System.Reflection; using System.Reflection;
using System.Threading; using System.Threading;
using Bit.Core;
using DbUp; using DbUp;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -28,7 +29,7 @@ namespace Bit.Migrator
{ {
if(enableLogging && _logger != null) if(enableLogging && _logger != null)
{ {
_logger.LogInformation("Migrating database."); _logger.LogInformation(Constants.BypassFiltersEventId, "Migrating database.");
} }
using(var connection = new SqlConnection(_masterConnectionString)) using(var connection = new SqlConnection(_masterConnectionString))
@ -83,11 +84,11 @@ namespace Bit.Migrator
{ {
if(result.Successful) if(result.Successful)
{ {
_logger.LogInformation("Migration successful."); _logger.LogInformation(Constants.BypassFiltersEventId, "Migration successful.");
} }
else else
{ {
_logger.LogError(result.Error, "Migration failed."); _logger.LogError(Constants.BypassFiltersEventId, result.Error, "Migration failed.");
} }
} }

9
util/Migrator/DbUpLogger.cs
View File

@ -1,4 +1,5 @@
using DbUp.Engine.Output; using Bit.Core;
using DbUp.Engine.Output;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace Bit.Migrator namespace Bit.Migrator
@ -14,17 +15,17 @@ namespace Bit.Migrator
public void WriteError(string format, params object[] args) public void WriteError(string format, params object[] args)
{ {
_logger.LogError(format, args); _logger.LogError(Constants.BypassFiltersEventId, format, args);
} }
public void WriteInformation(string format, params object[] args) public void WriteInformation(string format, params object[] args)
{ {
_logger.LogInformation(format, args); _logger.LogInformation(Constants.BypassFiltersEventId, format, args);
} }
public void WriteWarning(string format, params object[] args) public void WriteWarning(string format, params object[] args)
{ {
_logger.LogWarning(format, args); _logger.LogWarning(Constants.BypassFiltersEventId, format, args);
} }
} }
} }

4
util/Migrator/Migrator.csproj
View File

@ -14,4 +14,8 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Core\Core.csproj" />
</ItemGroup>
</Project> </Project>