From 5f97efbd0f2c516086df7df669403295438448c5 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 10 Sep 2021 19:03:46 +0000 Subject: [PATCH] --- server/AyaNova/Program.cs | 3 +++ server/AyaNova/Startup.cs | 19 +++++++++++++++++-- server/AyaNova/util/DbUtil.cs | 26 ++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/server/AyaNova/Program.cs b/server/AyaNova/Program.cs index b5faa9a0..8cc93423 100644 --- a/server/AyaNova/Program.cs +++ b/server/AyaNova/Program.cs @@ -185,6 +185,7 @@ namespace AyaNova logger.Info("OS - {0}", Environment.OSVersion.ToString()); logger.Info("TimeZone - {0}", TimeZoneInfo.Local.DisplayName); + logger.Info("OS Locale - {0}", System.Globalization.CultureInfo.CurrentCulture.EnglishName); logger.Debug("Machine - {0}", Environment.MachineName); logger.Debug("User - {0}", Environment.UserName); logger.Debug(".Net Version - {0}", Environment.Version.ToString()); @@ -203,6 +204,8 @@ namespace AyaNova ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("AyaNova server boot local time", DateTime.Now.ToString("s")); ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Server up time", TimeSpan.FromTicks(Environment.TickCount64).ToString()); ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("TimeZone", TimeZoneInfo.Local.DisplayName); + ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("OS Locale", System.Globalization.CultureInfo.CurrentCulture.EnglishName); + ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("RAM", FileUtil.GetBytesReadable(GC.GetGCMemoryInfo().TotalAvailableMemoryBytes)); ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Backup space", FileUtil.GetBytesReadable(UtilityFilesAvailableSpace)); ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Attachments space", FileUtil.GetBytesReadable(AttachmentFilesAvailableSpace)); diff --git a/server/AyaNova/Startup.cs b/server/AyaNova/Startup.cs index 6a02a85a..de9e7e4d 100644 --- a/server/AyaNova/Startup.cs +++ b/server/AyaNova/Startup.cs @@ -564,8 +564,23 @@ namespace AyaNova } + var dbServerVersionInfo = DbUtil.DBServerVersion(dbContext); + var dbServerRunTimeParameters = DbUtil.DBServerRunTimeParameters(dbContext); //Log server version - _newLog.LogInformation("Database server version - {0}", DbUtil.DBServerVersion(dbContext)); + _newLog.LogInformation("Database server version - {0}", dbServerVersionInfo); + + //db server extended parameters + _newLog.LogDebug("Database server runtime parameters - {0}", dbServerRunTimeParameters); + + + + ServerBootConfig.BOOT_DIAGNOSTIC_INFO.Add("Database server version", dbServerVersionInfo); + //log each item individually from runtime parameters + + + + + //Check schema _newLog.LogDebug("DB schema check"); @@ -663,7 +678,7 @@ namespace AyaNova Console.WriteLine("Forced immediate shutdown: Ctrl-c key combination"); Console.WriteLine("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-"); - + } diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs index 5aba233c..2f8382ea 100644 --- a/server/AyaNova/util/DbUtil.cs +++ b/server/AyaNova/util/DbUtil.cs @@ -145,6 +145,32 @@ namespace AyaNova.Util } } + /////////////////////////////////////////// + // Get database locale settings + // + internal static string DBServerRunTimeParameters(AyaNova.Models.AyContext ct) + { + using (var cmd = ct.Database.GetDbConnection().CreateCommand()) + { + ct.Database.OpenConnection(); + cmd.CommandText = $"SHOW ALL;"; + using (var dr = cmd.ExecuteReader()) + { + if (dr.Read()) + { + if (dr.IsDBNull(0)) + return "Unknown / no results"; + else + return (dr.GetString(0)); + } + else + { + return "Unknown / no results"; + } + } + } + } + /////////////////////////////////////////// //Verify that server exists