fix: use pattern matching to get raw sting value

GZTimeWalker · Feb 6, 2024 · c934718 · c934718
1 parent 70e6cd6
commit c934718
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/GZCTF/Extensions/DatabaseSinkExtension.cs b/src/GZCTF/Extensions/DatabaseSinkExtension.cs
@@ -55,14 +55,22 @@ static LogModel ToLogModel(LogEvent logEvent)
             TimeUtc = logEvent.Timestamp.ToUniversalTime(),
             Level = logEvent.Level.ToString(),
             Message = logEvent.RenderMessage(),
-            UserName = userName?.ToString()[1..^1] ?? "Anonymous",
-            Logger = sourceContext?.ToString()[1..^1] ?? "Unknown",
-            RemoteIP = ip?.ToString()[1..^1] ?? "",
-            Status = status?.ToString() ?? "",
+            UserName = GetStringValue(userName, "Anonymous"),
+            Logger = GetStringValue(sourceContext, "Unknown"),
+            RemoteIP = GetStringValue(ip),
+            Status = GetStringValue(status),
             Exception = logEvent.Exception?.ToString()
         };
     }
 
+    static string GetStringValue(LogEventPropertyValue? value, string defaultValue = "")
+    {
+        if (value is ScalarValue { Value: string rawValue })
+            return rawValue;
+        return value?.ToString() ?? defaultValue;
+    }
+
+
     async Task WriteToDatabase(CancellationToken token = default)
     {
         List<LogModel> lockedLogBuffer = [];

diff --git a/src/GZCTF/Utils/LogHelper.cs b/src/GZCTF/Utils/LogHelper.cs
@@ -86,7 +86,7 @@ public static void Log<T>(this ILogger<T> logger, string msg, string uname, stri
     {
         using (LogContext.PushProperty("UserName", uname))
         using (LogContext.PushProperty("IP", ip))
-        using (LogContext.PushProperty("Status", status.ToString()))
+        using (LogContext.PushProperty("Status", status))
         {
             logger.Log(level ?? LogLevel.Information, "{msg:l}", msg);
         }