Changeset 369 for binary-improvements/MapRendering/Web/SSE/EventLog.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/SSE/EventLog.cs (modified) (3 diffs)

binary-improvements/MapRendering/Web/SSE/EventLog.cs

@@ -1 +1 @@
 using System;
-using System.Net;
-using System.Text;
-using System.Text.RegularExpressions;
 using AllocsFixes.JSON;
 using UnityEngine;
@@ -8 +5 @@
 namespace AllocsFixes.NetConnections.Servers.Web.SSE {
         public class EventLog : EventBase {
-                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]+ (.*)$");
-
                 public EventLog (SseHandler _parent) : base (_parent, _name: "log") {
-                        Logger.Main.LogCallbacks += LogCallback;
+                        Log.LogCallbacksExtended += LogCallback;
                 }
 
-
-                private void LogCallback (string _msg, string _trace, LogType _type) {
-                        Match match = logMessageMatcher.Match (_msg);
-
-                        string date;
-                        string time;
-                        string uptime;
-                        string message;
-                        if (match.Success) {
-                                date = match.Groups [1].Value;
-                                time = match.Groups [2].Value;
-                                uptime = match.Groups [3].Value;
-                                message = match.Groups [4].Value;
-                        } else {
-                                DateTime dt = DateTime.Now;
-                                date = $"{dt.Year:0000}-{dt.Month:00}-{dt.Day:00}";
-                                time = $"{dt.Hour:00}:{dt.Minute:00}:{dt.Second:00}";
-                                uptime = "";
-                                message = _msg;
-                        }
+                private void LogCallback (string _formattedMsg, string _plainMsg, string _trace, LogType _type, DateTime _timestamp, long _uptime) {
+                        string date = $"{_timestamp.Year:0000}-{_timestamp.Month:00}-{_timestamp.Day:00}";
+                        string time = $"{_timestamp.Hour:00}:{_timestamp.Minute:00}:{_timestamp.Second:00}";
+                        string uptime = _uptime.ToString ();
+                        string message = _plainMsg;
 
                         JSONObject data = new JSONObject ();
@@ -46 +25 @@
                         SendData ("logLine", data);
                 }
-                
         }
 }