diff --git a/server/AyaNova/Controllers/ServerStateController.cs b/server/AyaNova/Controllers/ServerStateController.cs index 8c6e2800..dc3c38be 100644 --- a/server/AyaNova/Controllers/ServerStateController.cs +++ b/server/AyaNova/Controllers/ServerStateController.cs @@ -190,7 +190,8 @@ namespace AyaNova.Api.Controllers AYANOVA_LOG_PATH = ServerBootConfig.AYANOVA_LOG_PATH, AYANOVA_LOG_LEVEL = ServerBootConfig.AYANOVA_LOG_LEVEL, AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG = ServerBootConfig.AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG, - BOOT_DIAGNOSTIC_INFO = ServerBootConfig.BOOT_DIAGNOSTIC_INFO + BOOT_DIAGNOSTIC_INFO = ServerBootConfig.BOOT_DIAGNOSTIC_INFO, + DBSERVER_DIAGNOSTIC_INFO = ServerBootConfig.DBSERVER_DIAGNOSTIC_INFO })); } diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index de9e7e4d..93d16c10 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -570,11 +570,13 @@ namespace AyaNova _newLog.LogInformation("Database server version - {0}", dbServerVersionInfo); //db server extended parameters - _newLog.LogDebug("Database server runtime parameters - {0}", dbServerRunTimeParameters); + _newLog.LogInformation("Database server runtime parameters - {0}", string.Join(Environment.NewLine, dbServerRunTimeParameters)); + + ServerBootConfig.DBSERVER_DIAGNOSTIC_INFO.Add("DB SERVER", dbServerVersionInfo); + foreach (var p in dbServerRunTimeParameters) + ServerBootConfig.DBSERVER_DIAGNOSTIC_INFO.Add(p.Key, p.Value); - - ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Database server version", dbServerVersionInfo); //log each item individually from runtime parameters diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index 2f8382ea..b6e72553 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -145,30 +145,32 @@ namespace AyaNova.Util } } - /////////////////////////////////////////// - // Get database locale settings + /////////////////////////////////////////// + // Get database runtime parameter settings // - internal static string DBServerRunTimeParameters(AyaNova.Models.AyContext ct) + internal static Dictionary DBServerRunTimeParameters(AyaNova.Models.AyContext ct) { + Dictionary ret = new Dictionary(); using (var cmd = ct.Database.GetDbConnection().CreateCommand()) { ct.Database.OpenConnection(); cmd.CommandText = $"SHOW ALL;"; using (var dr = cmd.ExecuteReader()) { - if (dr.Read()) + while (dr.Read()) { - if (dr.IsDBNull(0)) - return "Unknown / no results"; - else - return (dr.GetString(0)); - } - else - { - return "Unknown / no results"; + string name = string.Empty; ; + string setting = string.Empty; + if (!dr.IsDBNull(0)) + name = dr.GetString(0); + if (!dr.IsDBNull(1)) + setting = dr.GetString(1); + ret.Add(name, setting); } + } } + return ret; } @@ -428,7 +430,7 @@ namespace AyaNova.Util await EraseTableAsync("apm", conn); //--- - await EraseTableAsync("afileattachment", conn); + await EraseTableAsync("afileattachment", conn); await EraseTableAsync("aevent", conn); await EraseTableAsync("adatalistsavedfilter", conn); await EraseTableAsync("adatalistcolumnview", conn); diff --git a/server/AyaNova/util/ServerBootConfig.cs b/server/AyaNova/util/ServerBootConfig.cs index 62f7f0d8..e7477a60 100644 --- a/server/AyaNova/util/ServerBootConfig.cs +++ b/server/AyaNova/util/ServerBootConfig.cs @@ -29,7 +29,7 @@ namespace AyaNova.Util internal static bool SEEDING { get; set; } //############################ - //############################ + //############################ //MIGRATING FLAG INTERNAL ONLY //used to speed up v8 migration with bypasses to notification processing internal static bool MIGRATING { get; set; } @@ -83,7 +83,8 @@ namespace AyaNova.Util internal static string AYANOVA_SET_SUPERUSER_PW { get; set; } //HELPFUL INFORMATION FOR DIAGNOSTICS - internal static Dictionary BOOT_DIAGNOSTIC_INFO {get;set;} + internal static Dictionary BOOT_DIAGNOSTIC_INFO { get; set; } = new Dictionary(); + internal static Dictionary DBSERVER_DIAGNOSTIC_INFO { get; set; } = new Dictionary(); /// @@ -93,7 +94,6 @@ namespace AyaNova.Util /// internal static void SetConfiguration(IConfigurationRoot config) { - BOOT_DIAGNOSTIC_INFO=new Dictionary(); #if (DEBUG) TranslationKeysRequested = new List();