Changeset 369 for binary-improvements/MapRendering/Web/LogBuffer.cs

Timestamp:

Nov 9, 2021, 6:28:33 PM (3 years ago)

Author:

alloc

Message:

Preparations for A20 release
Changes usage of "SteamID" to "UserID" in console commands
Also changes a bunch of the WebAPI stuff to show / use UserIDs

File:

• binary-improvements/MapRendering/Web/LogBuffer.cs (modified) (4 diffs)

binary-improvements/MapRendering/Web/LogBuffer.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 using UnityEngine;
 
@@ -8 +7 @@
                 private const int MAX_ENTRIES = 3000;
                 private static LogBuffer instance;
-
-                private static readonly Regex logMessageMatcher =
-                        new Regex (@"^([0-9]{4}-[0-9]{2}-[0-9]{2})T([0-9]{2}:[0-9]{2}:[0-9]{2}) ([0-9]+[,.][0-9]+) [A-Z]+ (.*)$");
 
                 private readonly List<LogEntry> logEntries = new List<LogEntry> ();
@@ -23 +19 @@
 
                 private LogBuffer () {
-                        Logger.Main.LogCallbacks += LogCallback;
+                        Log.LogCallbacksExtended += LogCallback;
                 }
 
@@ -72 +68 @@
                 }
 
-                private void LogCallback (string _msg, string _trace, LogType _type) {
+                private void LogCallback (string _formattedMsg, string _plainMsg, string _trace, LogType _type, DateTime _timestamp, long _uptime) {
                         LogEntry le = new LogEntry ();
 
-                        Match match = logMessageMatcher.Match (_msg);
-                        if (match.Success) {
-                                le.date = match.Groups [1].Value;
-                                le.time = match.Groups [2].Value;
-                                le.uptime = match.Groups [3].Value;
-                                le.message = match.Groups [4].Value;
-                        } else {
-                                DateTime dt = DateTime.Now;
-                                le.date = string.Format ("{0:0000}-{1:00}-{2:00}", dt.Year, dt.Month, dt.Day);
-                                le.time = string.Format ("{0:00}:{1:00}:{2:00}", dt.Hour, dt.Minute, dt.Second);
-                                le.uptime = "";
-                                le.message = _msg;
-                        }
-
+                        le.date = $"{_timestamp.Year:0000}-{_timestamp.Month:00}-{_timestamp.Day:00}";
+                        le.time = $"{_timestamp.Hour:00}:{_timestamp.Minute:00}:{_timestamp.Second:00}";
+                        le.uptime = _uptime.ToString ();
+                        le.message = _plainMsg;
                         le.trace = _trace;
                         le.type = _type;