🐛 should fall back on Environment.UserName if !win32

apache · Oct 18, 2020 · e137855 · e137855
1 parent 141b00b
commit e137855
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/log4net/Core/LoggingEvent.cs b/src/log4net/Core/LoggingEvent.cs
@@ -914,7 +914,7 @@ public string ThreadName
         /// </para>
         /// </remarks>
         public string UserName =>
-            m_data.UserName ??= TryGetCurrentUserName(); 
+            m_data.UserName ??= TryGetCurrentUserName() ?? SystemInfo.NotAvailableText; 
 
         private static string TryGetCurrentUserName()
         {
@@ -929,8 +929,7 @@ private static string TryGetCurrentUserName()
             }
             catch (PlatformNotSupportedException)
             {
-                // TODO: on a platform which supports it, invoke `whoami`
-                return SystemInfo.NotAvailableText;
+                return Environment.UserName;
             }
             catch (SecurityException)
             {
@@ -940,12 +939,15 @@ private static string TryGetCurrentUserName()
                     declaringType,
                     "Security exception while trying to get current windows identity. Error Ignored. Empty user name."
                 );
-
-                return SystemInfo.NotAvailableText;
+                return null;
+            }
+            catch
+            {
+                return null;
             }
 #endif
         }
-
+        
         /// <summary>
         /// Gets the identity of the current thread principal.
         /// </summary>