diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs index 8dc75c17c..84bdf05d2 100644 --- a/Projects/Server/Items/Item.cs +++ b/Projects/Server/Items/Item.cs @@ -4,6 +4,7 @@ using System.Diagnostics; using System.Runtime.CompilerServices; using Server.ContextMenus; using Server.Items; +using Server.Logging; using Server.Network; using Server.Targeting; @@ -177,6 +178,8 @@ namespace Server public class Item : IHued, IComparable, ISpawnable, IPropertyListObject { + private static readonly ILogger logger = LogFactory.GetLogger(typeof(Item)); + public const int QuestItemHue = 0x4EA; // Hmmmm... "for EA"? public static readonly List EmptyItems = new(); private static readonly Queue m_DeltaQueue = new(); @@ -3277,9 +3280,7 @@ namespace Server } catch (Exception ex) { -#if DEBUG - Console.WriteLine("Process Delta Queue for {0} failed: {1}", item, ex); -#endif + logger.Debug(ex, "Process Delta Queue for {Item} failed", item); } } diff --git a/Projects/Server/Logging/LogFactory.cs b/Projects/Server/Logging/LogFactory.cs index 2bf93a57d..aee8bb927 100644 --- a/Projects/Server/Logging/LogFactory.cs +++ b/Projects/Server/Logging/LogFactory.cs @@ -1,6 +1,6 @@ /************************************************************************* * ModernUO * - * Copyright 2019-2021 - ModernUO Development Team * + * Copyright 2019-2022 - ModernUO Development Team * * Email: hi@modernuo.com * * File: LogFactory.cs * * * @@ -16,16 +16,18 @@ using System; using Serilog; -namespace Server.Logging -{ - public static class LogFactory - { - private static readonly Serilog.ILogger serilogLogger = new LoggerConfiguration() - .WriteTo.Async(a => a.Console( - outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} {NewLine}{Exception}" - )) - .CreateLogger(); +namespace Server.Logging; - public static ILogger GetLogger(Type declaringType) => new SerilogLogger(serilogLogger.ForContext(declaringType)); - } +public static class LogFactory +{ + private static readonly Serilog.ILogger serilogLogger = new LoggerConfiguration() + .WriteTo.Async(a => a.Console( + outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} {NewLine}{Exception}" + )) +#if DEBUG + .MinimumLevel.Debug() +#endif + .CreateLogger(); + + public static ILogger GetLogger(Type declaringType) => new SerilogLogger(serilogLogger.ForContext(declaringType)); } diff --git a/Projects/Server/Maps/MapLoader.cs b/Projects/Server/Maps/MapLoader.cs index 80294537d..ca0ed6119 100644 --- a/Projects/Server/Maps/MapLoader.cs +++ b/Projects/Server/Maps/MapLoader.cs @@ -70,9 +70,7 @@ namespace Server } catch (Exception ex) { -#if DEBUG - Console.WriteLine(ex); -#endif + logger.Debug(ex, "Failed to load map definition {MapDefName} ({MapDefId})", def.Name, def.Id); failures.Add($"\tInvalid map definition {def.Name} ({def.Id})"); } } diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs index 1c69579c7..8a953447c 100644 --- a/Projects/Server/Mobiles/Mobile.cs +++ b/Projects/Server/Mobiles/Mobile.cs @@ -7908,9 +7908,7 @@ namespace Server } catch (Exception ex) { -#if DEBUG - Console.WriteLine("Process Delta Queue for {0} failed: {1}", mob, ex); -#endif + logger.Debug(ex, "Process Delta Queue for {Mobile} failed", mob); } } diff --git a/Projects/Server/Network/NetState/NetState.cs b/Projects/Server/Network/NetState/NetState.cs index d76846c0b..267a0c0da 100755 --- a/Projects/Server/Network/NetState/NetState.cs +++ b/Projects/Server/Network/NetState/NetState.cs @@ -516,9 +516,6 @@ public partial class NetState : IComparable } catch (Exception ex) { -#if DEBUG - Console.WriteLine(ex); -#endif TraceException(ex); Disconnect("Exception while sending."); } @@ -861,18 +858,14 @@ public partial class NetState : IComparable } catch (SocketException ex) { - // Socket exceptions are generally ok, just spammy -#if DEBUG - Console.WriteLine(ex); -#endif - - Disconnect(string.Empty); + if (ex.SocketErrorCode != SocketError.WouldBlock) + { + logger.Debug(ex, "Disconnected due to socket exception"); + Disconnect(string.Empty); + } } catch (Exception ex) { -#if DEBUG - Console.WriteLine(ex); -#endif Disconnect($"Disconnected with error: {ex}"); TraceException(ex); } @@ -910,19 +903,15 @@ public partial class NetState : IComparable } catch (SocketException ex) { -#if DEBUG - if (ex.ErrorCode != 54 && ex.ErrorCode != 89 && ex.ErrorCode != 995) - { - Console.WriteLine(ex); - } -#endif + if (ex.ErrorCode is not 54 and not 89 and not 995) + { + logger.Debug(ex, "Disconnected due to a socket exception"); + } + Disconnect(string.Empty); } catch (Exception ex) { -#if DEBUG - Console.WriteLine(ex); -#endif Disconnect($"Disconnected with error: {ex}"); TraceException(ex); }