admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2021-09-10 19:22:18 +00:00
parent 5f97efbd0f
commit 8cf8188ff9
4 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/AyaNova/Controllers/ServerStateController.cs
View File

@@ -190,7 +190,8 @@ namespace AyaNova.Api.Controllers
AYANOVA_LOG_PATH = ServerBootConfig.AYANOVA_LOG_PATH, AYANOVA_LOG_PATH = ServerBootConfig.AYANOVA_LOG_PATH,
AYANOVA_LOG_LEVEL = ServerBootConfig.AYANOVA_LOG_LEVEL, AYANOVA_LOG_LEVEL = ServerBootConfig.AYANOVA_LOG_LEVEL,
AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG = ServerBootConfig.AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG, 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
})); }));
} }

8
server/AyaNova/Startup.cs
View File

@@ -570,11 +570,13 @@ namespace AyaNova
_newLog.LogInformation("Database server version - {0}", dbServerVersionInfo); _newLog.LogInformation("Database server version - {0}", dbServerVersionInfo);
//db server extended parameters //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 //log each item individually from runtime parameters

28
server/AyaNova/util/DbUtil.cs
View File

@@ -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<string, string> DBServerRunTimeParameters(AyaNova.Models.AyContext ct)
{ {
Dictionary<string, string> ret = new Dictionary<string, string>();
using (var cmd = ct.Database.GetDbConnection().CreateCommand()) using (var cmd = ct.Database.GetDbConnection().CreateCommand())
{ {
ct.Database.OpenConnection(); ct.Database.OpenConnection();
cmd.CommandText = $"SHOW ALL;"; cmd.CommandText = $"SHOW ALL;";
using (var dr = cmd.ExecuteReader()) using (var dr = cmd.ExecuteReader())
{ {
if (dr.Read()) while (dr.Read())
{ {
if (dr.IsDBNull(0)) string name = string.Empty; ;
return "Unknown / no results"; string setting = string.Empty;
else if (!dr.IsDBNull(0))
return (dr.GetString(0)); name = dr.GetString(0);
} if (!dr.IsDBNull(1))
else setting = dr.GetString(1);
{ ret.Add(name, setting);
return "Unknown / no results";
} }
} }
} }
return ret;
} }
@@ -428,7 +430,7 @@ namespace AyaNova.Util
await EraseTableAsync("apm", conn); await EraseTableAsync("apm", conn);
//--- //---
await EraseTableAsync("afileattachment", conn); await EraseTableAsync("afileattachment", conn);
await EraseTableAsync("aevent", conn); await EraseTableAsync("aevent", conn);
await EraseTableAsync("adatalistsavedfilter", conn); await EraseTableAsync("adatalistsavedfilter", conn);
await EraseTableAsync("adatalistcolumnview", conn); await EraseTableAsync("adatalistcolumnview", conn);

6
server/AyaNova/util/ServerBootConfig.cs
View File

@@ -29,7 +29,7 @@ namespace AyaNova.Util
internal static bool SEEDING { get; set; } internal static bool SEEDING { get; set; }
//############################ //############################
//############################ //############################
//MIGRATING FLAG INTERNAL ONLY //MIGRATING FLAG INTERNAL ONLY
//used to speed up v8 migration with bypasses to notification processing //used to speed up v8 migration with bypasses to notification processing
internal static bool MIGRATING { get; set; } internal static bool MIGRATING { get; set; }
@@ -83,7 +83,8 @@ namespace AyaNova.Util
internal static string AYANOVA_SET_SUPERUSER_PW { get; set; } internal static string AYANOVA_SET_SUPERUSER_PW { get; set; }
//HELPFUL INFORMATION FOR DIAGNOSTICS //HELPFUL INFORMATION FOR DIAGNOSTICS
internal static Dictionary<string,string> BOOT_DIAGNOSTIC_INFO {get;set;} internal static Dictionary<string, string> BOOT_DIAGNOSTIC_INFO { get; set; } = new Dictionary<string, string>();
internal static Dictionary<string, string> DBSERVER_DIAGNOSTIC_INFO { get; set; } = new Dictionary<string, string>();
/// <summary> /// <summary>
@@ -93,7 +94,6 @@ namespace AyaNova.Util
/// <param name="config"></param> /// <param name="config"></param>
internal static void SetConfiguration(IConfigurationRoot config) internal static void SetConfiguration(IConfigurationRoot config)
{ {
BOOT_DIAGNOSTIC_INFO=new Dictionary<string, string>();
#if (DEBUG) #if (DEBUG)
TranslationKeysRequested = new List<string>(); TranslationKeysRequested = new List<string>();