+
@@ -21,6 +21,7 @@
[
['Event Time', 'logs_table_cell_150px'],
['Severity', 'logs_table_cell_150px'],
+ 'Process',
'Message'
],
'',
@@ -29,18 +30,26 @@
);
for (var i = 0; i < result.length; i++) {
- var exceptionString = '';
- if (result[i].exceptionValue) {
- exceptionString = "Exception
" + syntaxHighlight(JSON.stringify(result[i].exceptionValue, null, 2)).replace(/\\n/g, "
") + "
";
- }
-
var newRow = [
moment(result[i].eventTime).fromNow(),
result[i].eventType,
- result[i].process + " - " + result[i].message + exceptionString
+ result[i].process,
+ result[i].message
];
- newTable.appendChild(createTableRow(false, newRow, 'romrow', 'romcell logs_table_cell'));
+ newTable.appendChild(createTableRow(false, newRow, 'romrow logs_table_row_' + result[i].eventType, 'romcell logs_table_cell'));
+
+ if (result[i].exceptionValue) {
+ var exceptionString = "Exception
" + syntaxHighlight(JSON.stringify(result[i].exceptionValue, null, 2)).replace(/\\n/g, "
") + "
";
+ var exRow = document.createElement('tr');
+ var leadCell = document.createElement('td');
+ exRow.appendChild(leadCell);
+ var exCell = document.createElement('td');
+ exCell.colSpan = '3';
+ exCell.innerHTML = exceptionString;
+ exRow.appendChild(exCell);
+ newTable.appendChild(exRow);
+ }
}
}
);
diff --git a/gaseous-server/wwwroot/styles/style.css b/gaseous-server/wwwroot/styles/style.css
index 84865dd..e18a251 100644
--- a/gaseous-server/wwwroot/styles/style.css
+++ b/gaseous-server/wwwroot/styles/style.css
@@ -893,6 +893,22 @@ button:disabled {
vertical-align: top;
}
+.logs_table_row_Information:hover {
+ background: rgba(42, 41, 150, 0.3);
+}
+
+.logs_table_row_Warning:hover {
+ background: rgba(139, 150, 41, 0.3);
+}
+
+.logs_table_row_Critical:hover {
+ background: rgba(150, 41, 41, 0.3);
+}
+
+.logs_table_row_Debug:hover {
+ background: rgba(150, 41, 135, 0.3);
+}
+
.logs_table_exception {
margin-right: 10px;
padding: 5px;
diff --git a/gaseous-tools/Config.cs b/gaseous-tools/Config.cs
index 870b576..9573b73 100644
--- a/gaseous-tools/Config.cs
+++ b/gaseous-tools/Config.cs
@@ -82,7 +82,7 @@ namespace gaseous_tools
{
get
{
- string logFileExtension = "json";
+ string logFileExtension = "txt";
string logPathName = Path.Combine(LogPath, "Server Log " + DateTime.Now.ToUniversalTime().ToString("yyyyMMdd") + "." + logFileExtension);
return logPathName;
@@ -468,7 +468,8 @@ namespace gaseous_tools
{
public bool DebugLogging = false;
- public int LogRetention = 30;
+ // log retention in days
+ public int LogRetention = 7;
public enum LoggingFormat
{
diff --git a/gaseous-tools/Database.cs b/gaseous-tools/Database.cs
index 5b81da0..1411d07 100644
--- a/gaseous-tools/Database.cs
+++ b/gaseous-tools/Database.cs
@@ -236,7 +236,7 @@ namespace gaseous_tools
{
DataTable RetTable = new DataTable();
- Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database");
+ Logging.Log(Logging.LogType.Debug, "Database", "Connecting to database", null, true);
MySqlConnection conn = new MySqlConnection(DBConn);
conn.Open();
@@ -254,11 +254,11 @@ namespace gaseous_tools
try
{
- Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'");
+ Logging.Log(Logging.LogType.Debug, "Database", "Executing sql: '" + SQL + "'", null, true);
if (Parameters.Count > 0)
{
string dictValues = string.Join(";", Parameters.Select(x => string.Join("=", x.Key, x.Value)));
- Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues);
+ Logging.Log(Logging.LogType.Debug, "Database", "Parameters: " + dictValues, null, true);
}
RetTable.Load(cmd.ExecuteReader());
} catch (Exception ex) {
@@ -267,7 +267,7 @@ namespace gaseous_tools
Trace.WriteLine("Full exception: " + ex.ToString());
}
- Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection");
+ Logging.Log(Logging.LogType.Debug, "Database", "Closing database connection", null, true);
conn.Close();
return RetTable;
diff --git a/gaseous-tools/Database/MySQL/gaseous-1002.sql b/gaseous-tools/Database/MySQL/gaseous-1002.sql
index 747d286..aaba6cf 100644
--- a/gaseous-tools/Database/MySQL/gaseous-1002.sql
+++ b/gaseous-tools/Database/MySQL/gaseous-1002.sql
@@ -44,3 +44,15 @@ CREATE TABLE `PlatformMap_Bios` (
`Description` LONGTEXT NOT NULL,
`Hash` VARCHAR(45) NOT NULL,
PRIMARY KEY (`Id`, `Filename`, `Hash`));
+
+CREATE TABLE `ServerLogs` (
+ `Id` BIGINT NOT NULL AUTO_INCREMENT,
+ `EventTime` DATETIME NOT NULL,
+ `EventType` INT NOT NULL,
+ `Process` VARCHAR(100) NOT NULL,
+ `Message` LONGTEXT NOT NULL,
+ `Exception` LONGTEXT NULL,
+ PRIMARY KEY (`Id`));
+
+ALTER TABLE `PlatformVersion`
+CHANGE COLUMN `PlatformLogo` `PlatformLogo` BIGINT NULL DEFAULT NULL ;
\ No newline at end of file
diff --git a/gaseous-tools/Logging.cs b/gaseous-tools/Logging.cs
index ca95e11..dca94f0 100644
--- a/gaseous-tools/Logging.cs
+++ b/gaseous-tools/Logging.cs
@@ -1,4 +1,5 @@
using System;
+using System.Data;
using System.Diagnostics;
using System.Reflection;
using System.Reflection.Metadata.Ecma335;
@@ -7,12 +8,7 @@ namespace gaseous_tools
{
public class Logging
{
- // when was the last clean
- static DateTime LastRetentionClean = DateTime.UtcNow;
- // how often to clean in hours
- const int RetentionCleanInterval = 1;
-
- static public void Log(LogType EventType, string ServerProcess, string Message, Exception? ExceptionValue = null)
+ static public void Log(LogType EventType, string ServerProcess, string Message, Exception? ExceptionValue = null, bool LogToDiskOnly = false)
{
LogItem logItem = new LogItem
{
@@ -20,7 +16,7 @@ namespace gaseous_tools
EventType = EventType,
Process = ServerProcess,
Message = Message,
- ExceptionValue = ExceptionValue
+ ExceptionValue = Common.ReturnValueIfNull(ExceptionValue, "").ToString()
};
bool AllowWrite = false;
@@ -65,67 +61,73 @@ namespace gaseous_tools
Console.WriteLine(TraceOutput);
Console.ResetColor();
- Newtonsoft.Json.JsonSerializerSettings serializerSettings = new Newtonsoft.Json.JsonSerializerSettings
+ if (LogToDiskOnly == false)
{
- NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore,
- Formatting = Newtonsoft.Json.Formatting.None
- };
- serializerSettings.Converters.Add(new Newtonsoft.Json.Converters.StringEnumConverter());
+ Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+ string sql = "DELETE FROM ServerLogs WHERE EventTime < @EventRententionDate; INSERT INTO ServerLogs (EventTime, EventType, Process, Message, Exception) VALUES (@EventTime, @EventType, @Process, @Message, @Exception);";
+ Dictionary dbDict = new Dictionary();
+ dbDict.Add("EventRententionDate", DateTime.UtcNow.AddDays(Config.LoggingConfiguration.LogRetention * -1));
+ dbDict.Add("EventTime", logItem.EventTime);
+ dbDict.Add("EventType", logItem.EventType);
+ dbDict.Add("Process", logItem.Process);
+ dbDict.Add("Message", logItem.Message);
+ dbDict.Add("Exception", Common.ReturnValueIfNull(logItem.ExceptionValue, "").ToString());
- // write log file
- string JsonOutput = Newtonsoft.Json.JsonConvert.SerializeObject(logItem, serializerSettings);
- File.AppendAllText(Config.LogFilePath, JsonOutput);
- }
-
- // quick clean before we go
- if (LastRetentionClean.AddHours(RetentionCleanInterval) < DateTime.UtcNow)
- {
- LogCleanup();
+ try
+ {
+ db.ExecuteCMD(sql, dbDict);
+ }
+ catch (Exception ex)
+ {
+ LogToDisk(logItem, TraceOutput, ex);
+ }
+ }
+ else
+ {
+ LogToDisk(logItem, TraceOutput, null);
+ }
}
}
- static public List GetLogs() {
- string logData = File.ReadAllText(Config.LogFilePath);
+ static void LogToDisk(LogItem logItem, string TraceOutput, Exception? exception)
+ {
+ if (exception != null)
+ {
+ // dump the error
+ File.AppendAllText(Config.LogFilePath, logItem.EventTime.ToString("yyyyMMdd HHmmss") + ": " + logItem.EventType.ToString() + ": " + logItem.Process + ": " + logItem.Message + Environment.NewLine + exception.ToString());
+
+
+ // something went wrong writing to the db
+ File.AppendAllText(Config.LogFilePath, logItem.EventTime.ToString("yyyyMMdd HHmmss") + ": The following event was unable to be written to the log database:");
+ }
+
+ File.AppendAllText(Config.LogFilePath, TraceOutput);
+ }
+
+ static public List GetLogs()
+ {
+ Database db = new gaseous_tools.Database(Database.databaseType.MySql, Config.DatabaseConfiguration.ConnectionString);
+ string sql = "SELECT * FROM ServerLogs ORDER BY Id DESC";
+ DataTable dataTable = db.ExecuteCMD(sql);
List logs = new List();
- if (File.Exists(Config.LogFilePath))
+ foreach (DataRow row in dataTable.Rows)
{
- StreamReader sr = new StreamReader(Config.LogFilePath);
- while (!sr.EndOfStream)
+ LogItem log = new LogItem
{
- LogItem logItem = Newtonsoft.Json.JsonConvert.DeserializeObject(sr.ReadLine());
- logs.Add(logItem);
- }
- logs.Reverse();
+ EventTime = DateTime.Parse(((DateTime)row["EventTime"]).ToString("yyyy-MM-ddThh:mm:ss") + 'Z'),
+ EventType = (LogType)row["EventType"],
+ Process = (string)row["Process"],
+ Message = (string)row["Message"],
+ ExceptionValue = (string)row["Exception"]
+ };
+
+ logs.Add(log);
}
return logs;
}
- static public void LogCleanup()
- {
- Log(LogType.Information, "Log Cleanup", "Purging log files older than " + Config.LoggingConfiguration.LogRetention + " days");
- LastRetentionClean = DateTime.UtcNow;
-
- string[] files = Directory.GetFiles(Config.LogPath, "Server Log *.json");
-
- foreach (string file in files)
- {
- FileInfo fi = new FileInfo(file);
- if (fi.LastAccessTime.AddDays(Config.LoggingConfiguration.LogRetention) < DateTime.Now)
- {
- try
- {
- fi.Delete();
- }
- catch
- {
- Log(LogType.Warning, "Log Cleanup", "Failed purging log " + fi.FullName);
- }
- }
- }
- }
-
public enum LogType
{
Information = 0,
@@ -151,7 +153,7 @@ namespace gaseous_tools
_Message = value;
}
}
- public Exception? ExceptionValue { get; set; }
+ public string? ExceptionValue { get; set; }
}
}
}
