nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-17 11:08:16 -05:00
Code

config for rolling log files by size limit

Browse Source
This commit is contained in:
Kyle Spearrin 2019-11-22 10:33:57 -05:00
parent ac5bc34e77
commit d270311393
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/GlobalSettings.cs
View File

@ -10,6 +10,7 @@ namespace Bit.Core
public virtual string StripeApiKey { get; set; } public virtual string StripeApiKey { get; set; }
public virtual string ProjectName { get; set; } public virtual string ProjectName { get; set; }
public virtual string LogDirectory { get; set; } public virtual string LogDirectory { get; set; }
public virtual long? LogRoleBySizeLimit { get; set; }
public virtual string LicenseDirectory { get; set; } public virtual string LicenseDirectory { get; set; }
public string LicenseCertificatePassword { get; set; } public string LicenseCertificatePassword { get; set; }
public virtual string PushRelayBaseUri { get; set; } public virtual string PushRelayBaseUri { get; set; }

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

@ -18,7 +18,7 @@ namespace Bit.Core.Utilities
{ {
if(env.IsDevelopment()) if(env.IsDevelopment())
{ {
return; return;
} }
if(CoreHelpers.SettingHasValue(globalSettings?.Sentry.Dsn)) if(CoreHelpers.SettingHasValue(globalSettings?.Sentry.Dsn))
@ -35,7 +35,7 @@ namespace Bit.Core.Utilities
{ {
if(context.HostingEnvironment.IsDevelopment()) if(context.HostingEnvironment.IsDevelopment())
{ {
return builder; return builder;
} }
bool inclusionPredicate(LogEvent e) bool inclusionPredicate(LogEvent e)
@ -77,7 +77,18 @@ namespace Bit.Core.Utilities
} }
else if(CoreHelpers.SettingHasValue(globalSettings.LogDirectory)) else if(CoreHelpers.SettingHasValue(globalSettings.LogDirectory))
{ {
config.WriteTo.RollingFile($"{globalSettings.LogDirectory}/{globalSettings.ProjectName}/{{Date}}.txt") if(globalSettings.LogRoleBySizeLimit.HasValue)
{
config.WriteTo
.RollingFile($"{globalSettings.LogDirectory}/{globalSettings.ProjectName}/log.txt",
fileSizeLimitBytes: globalSettings.LogRoleBySizeLimit);
}
else
{
config.WriteTo
.RollingFile($"{globalSettings.LogDirectory}/{globalSettings.ProjectName}/{{Date}}.txt");
}
config
.Enrich.FromLogContext() .Enrich.FromLogContext()
.Enrich.WithProperty("Project", globalSettings.ProjectName); .Enrich.WithProperty("Project", globalSettings.ProjectName);
} }