Changeset 467 for TFP-WebServer/WebServer/src/WebAPI/APIs/LogApi.cs

Timestamp:

Aug 18, 2023, 12:08:10 PM (15 months ago)

Author:

alloc

Message:

21.1.16.2 WebServer release
Added "id"s to messages in log API / event
Added "baseUrl" to mods API for WebMods

File:

• TFP-WebServer/WebServer/src/WebAPI/APIs/LogApi.cs (modified) (3 diffs)

TFP-WebServer/WebServer/src/WebAPI/APIs/LogApi.cs

@@ -12 +12 @@
                 private static readonly byte[] jsonKeyLastLine = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("lastLine");
 
-                private static readonly byte[] jsonMsgKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("msg");
+                private static readonly byte[] jsonIdKey = JsonWriter.GetEncodedPropertyNameWithBeginObject ("id");
+                private static readonly byte[] jsonMsgKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("msg");
                 private static readonly byte[] jsonTypeKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("type");
                 private static readonly byte[] jsonTraceKey = JsonWriter.GetEncodedPropertyNameWithPrefixValueSeparator ("trace");
@@ -57 +58 @@
                                 }
 
-                                writer.WriteRaw (jsonMsgKey);
-                                writer.WriteString (logEntry.Message);
-
-                                writer.WriteRaw (jsonTypeKey);
-                                writer.WriteString (logEntry.Type.ToStringCached ());
-
-                                writer.WriteRaw (jsonTraceKey);
-                                writer.WriteString (logEntry.Trace);
-
-                                writer.WriteRaw (jsonIsotimeKey);
-                                writer.WriteString (logEntry.IsoTime);
-
-                                writer.WriteRaw (jsonUptimeKey);
-                                writer.WriteString (logEntry.Uptime.ToString ());
-
-                                writer.WriteEndObject ();
+                                WriteLogMessageObject (ref writer, logEntry);
                         }
 
@@ -87 +73 @@
                         SendEnvelopedResult (_context, ref writer);
                 }
+
+                public static void WriteLogMessageObject (ref JsonWriter _writer, LogBuffer.LogEntry _logEntry) {
+                        _writer.WriteRaw (jsonIdKey);
+                        _writer.WriteInt32 (_logEntry.MessageId);
+                        
+                        _writer.WriteRaw (jsonMsgKey);
+                        _writer.WriteString (_logEntry.Message);
+
+                        _writer.WriteRaw (jsonTypeKey);
+                        _writer.WriteString (_logEntry.Type.ToStringCached ());
+
+                        _writer.WriteRaw (jsonTraceKey);
+                        _writer.WriteString (_logEntry.Trace);
+
+                        _writer.WriteRaw (jsonIsotimeKey);
+                        _writer.WriteString (_logEntry.IsoTime);
+
+                        _writer.WriteRaw (jsonUptimeKey);
+                        _writer.WriteString (_logEntry.Uptime.ToString ());
+
+                        _writer.WriteEndObject ();
+                }
         }
 }