This commit is contained in:
2020-07-29 23:13:20 +00:00
parent b30a911351
commit 90052f1000
7 changed files with 40 additions and 28 deletions

View File

@@ -23,7 +23,7 @@ namespace AyaNova
//Boot lock for generator
ServerGlobalOpsSettingsCache.BOOTING = true;
//Get config
var config = new ConfigurationBuilder().AddEnvironmentVariables().AddCommandLine(args).Build();
ServerBootConfig.SetConfiguration(config);
@@ -39,7 +39,7 @@ namespace AyaNova
//default log level
NLog.LogLevel NLogLevel = NLog.LogLevel.Info;
bool logLevelIsInfoOrHigher = true;
bool FilterOutMicrosoftLogItems = true;
switch (ServerBootConfig.AYANOVA_LOG_LEVEL.ToLowerInvariant())
{
@@ -57,11 +57,10 @@ namespace AyaNova
break;
case "debug":
NLogLevel = NLog.LogLevel.Debug;
logLevelIsInfoOrHigher = false;
break;
case "trace":
NLogLevel = NLog.LogLevel.Trace;
logLevelIsInfoOrHigher = false;
FilterOutMicrosoftLogItems = false;//Only at TRACE level do we want to see all the Microsoft logging stuff
break;
default:
NLogLevel = NLog.LogLevel.Info;
@@ -134,7 +133,7 @@ namespace AyaNova
logConfig.LoggingRules.Add(logRuleForConsole);
//only log microsoft stuff it log is debug level or lower
if (logLevelIsInfoOrHigher)
if (FilterOutMicrosoftLogItems)
{
//filter OUT microsoft stuff
logConfig.LoggingRules.Add(logRuleFilterOutMicrosoft);
@@ -165,7 +164,7 @@ namespace AyaNova
//log configuration
try
{
var AyaNovaConfig = config.AsEnumerable().Where(z => z.Key.StartsWith("AYANOVA") && z.Key != "AYANOVA_JWT_SECRET"&& z.Key != "AYANOVA_SET_SUPERUSER_PW").Select(z => z.Key + "=" + z.Value).ToList();
var AyaNovaConfig = config.AsEnumerable().Where(z => z.Key.StartsWith("AYANOVA") && z.Key != "AYANOVA_JWT_SECRET" && z.Key != "AYANOVA_SET_SUPERUSER_PW").Select(z => z.Key + "=" + z.Value).ToList();
var DiagConfig = string.Join(",", AyaNovaConfig);
DiagConfig = DbUtil.PasswordRedactedConnectionString(DiagConfig);
logger.Info($"Config {DiagConfig}");