diff --git a/DTLib/DTLib.csproj b/DTLib/DTLib.csproj index 81f0e3d..f9913b2 100644 --- a/DTLib/DTLib.csproj +++ b/DTLib/DTLib.csproj @@ -2,7 +2,7 @@ DTLib - 1.7.0 + 1.7.1 Timerix Library for all my C# projects GIT diff --git a/DTLib/Logging/Loggers/CompositeLogger.cs b/DTLib/Logging/Loggers/CompositeLogger.cs index a4e0323..4c10784 100644 --- a/DTLib/Logging/Loggers/CompositeLogger.cs +++ b/DTLib/Logging/Loggers/CompositeLogger.cs @@ -11,8 +11,8 @@ public class CompositeLogger : ILogger set { _debugLogEnabled = value; - for (int i = 0; i < _loggers.Length; i++) - _loggers[i].DebugLogEnabled = value; + foreach (var childLogger in ChildLoggers) + childLogger.DebugLogEnabled = value; } } @@ -22,8 +22,8 @@ public class CompositeLogger : ILogger set { _infoLogEnabled = true; - for (int i = 0; i < _loggers.Length; i++) - _loggers[i].InfoLogEnabled = value; + foreach (var childLogger in ChildLoggers) + childLogger.InfoLogEnabled = value; } } @@ -33,8 +33,8 @@ public class CompositeLogger : ILogger set { _warnLogEnabled = value; - for (int i = 0; i < _loggers.Length; i++) - _loggers[i].WarnLogEnabled = value; + foreach (var childLogger in ChildLoggers) + childLogger.WarnLogEnabled = value; } } @@ -44,46 +44,38 @@ public class CompositeLogger : ILogger set { _errorLogenabled = value; - for (int i = 0; i < _loggers.Length; i++) - _loggers[i].ErrorLogEnabled = value; + foreach (var childLogger in ChildLoggers) + childLogger.ErrorLogEnabled = value; } } public ILogFormat Format { get; set; } + public readonly List ChildLoggers; - protected ILogger[] _loggers; - private bool _debugLogEnabled = -#if DEBUG - true; -#else - false; -#endif + private bool _debugLogEnabled; private bool _infoLogEnabled = true; private bool _warnLogEnabled = true; private bool _errorLogenabled = true; - public CompositeLogger(ILogFormat format, params ILogger[] loggers) + public CompositeLogger(ILogFormat format, params ILogger[] childLoggers) { Format = format; - _loggers = loggers; + ChildLoggers = new List(childLoggers); } - public CompositeLogger(params ILogger[] loggers) : this(new DefaultLogFormat(), loggers) + public CompositeLogger(params ILogger[] childLoggers) : this(new DefaultLogFormat(), childLoggers) {} public void Log(string context, LogSeverity severity, object message, ILogFormat format) { - if(!this.CheckSeverity(severity)) - return; - - for (int i = 0; i < _loggers.Length; i++) - _loggers[i].Log(context, severity, message, format); + foreach (var childLogger in ChildLoggers) + childLogger.Log(context, severity, message, format); } public void Dispose() { - for (int i = 0; i < _loggers.Length; i++) - _loggers[i].Dispose(); + foreach (var childLogger in ChildLoggers) + childLogger.Dispose(); } } \ No newline at end of file