Removed unnecessary threshold property

Caldas · Caldas · commit cfcfc6ec10c7 · 2018-02-22T19:32:04.000-03:00
#50
diff --git a/src/SplunkLogger/Configurations/SplunkLoggerConfiguration.cs b/src/SplunkLogger/Configurations/SplunkLoggerConfiguration.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Logging;
-
+﻿
 namespace Splunk.Configurations
 {
     /// <summary>
@@ -16,10 +15,5 @@ public class SplunkLoggerConfiguration
         /// Gets or sets the socket configuration.
         /// </summary>
         public SocketConfiguration SocketConfiguration { get; set; }
-
-        /// <summary>
-        /// Gets or sets the threshold.
-        /// </summary>
-        public LogLevel Threshold { get; set; }
     }
 }
diff --git a/src/SplunkLogger/Loggers/BaseLogger.cs b/src/SplunkLogger/Loggers/BaseLogger.cs
@@ -11,18 +11,15 @@ public abstract class BaseLogger : ILogger
         protected readonly ILoggerFormatter loggerFormatter;
 
         readonly string categoryName;
-        readonly LogLevel threshold;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="T:Splunk.Loggers.BaseLogger"/> class.
         /// </summary>
         /// <param name="categoryName">Category name.</param>
-        /// <param name="threshold">Threshold.</param>
         /// <param name="loggerFormatter">Formatter instance.</param>
-        public BaseLogger(string categoryName, LogLevel threshold, ILoggerFormatter loggerFormatter)
+        public BaseLogger(string categoryName, ILoggerFormatter loggerFormatter)
         {
             this.categoryName = categoryName;
-            this.threshold = threshold;
             this.loggerFormatter = loggerFormatter;
         }
 
@@ -33,7 +30,7 @@ public BaseLogger(string categoryName, LogLevel threshold, ILoggerFormatter logg
         /// <param name="logLevel">.Net Core Log level.</param>
         public bool IsEnabled(LogLevel logLevel)
         {
-            return (int)logLevel >= (int)threshold;
+            return true;
         }
 
         /// <summary>
diff --git a/src/SplunkLogger/Loggers/HECBaseLogger.cs b/src/SplunkLogger/Loggers/HECBaseLogger.cs
@@ -16,12 +16,11 @@ public abstract class HECBaseLogger : BaseLogger
         /// Initializes a new instance of the <see cref="T:Splunk.Loggers.HECBaseLogger"/> class.
         /// </summary>
         /// <param name="categoryName">Category name.</param>
-        /// <param name="threshold">Threshold.</param>
         /// <param name="httpClient">Http client.</param>
         /// <param name="batchManager">Batch manager.</param>
         /// <param name="loggerFormatter">Formatter instance.</param>
-        public HECBaseLogger(string categoryName, LogLevel threshold, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)
-            : base(categoryName, threshold, loggerFormatter)
+        public HECBaseLogger(string categoryName, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)
+            : base(categoryName, loggerFormatter)
         {
             this.httpClient = httpClient;
             this.batchManager = batchManager;
diff --git a/src/SplunkLogger/Loggers/HECJsonLogger.cs b/src/SplunkLogger/Loggers/HECJsonLogger.cs
@@ -14,12 +14,11 @@ public class HECJsonLogger : HECBaseLogger, ILogger
         /// Initializes a new instance of the <see cref="T:Splunk.Loggers.HECJsonLogger"/> class.
         /// </summary>
         /// <param name="categoryName">Category name.</param>
-        /// <param name="threshold">Threshold.</param>
         /// <param name="httpClient">Http client.</param>
         /// <param name="batchManager">Batch manager.</param>
         /// <param name="loggerFormatter">Formatter instance.</param>
-        public HECJsonLogger(string categoryName, LogLevel threshold, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)
-            : base(categoryName, threshold, httpClient, batchManager, loggerFormatter)
+        public HECJsonLogger(string categoryName, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)
+            : base(categoryName, httpClient, batchManager, loggerFormatter)
         {
         }
 
diff --git a/src/SplunkLogger/Loggers/HECRawLogger.cs b/src/SplunkLogger/Loggers/HECRawLogger.cs
@@ -13,12 +13,11 @@ public class HECRawLogger : HECBaseLogger, ILogger
         /// Initializes a new instance of the <see cref="T:Splunk.Loggers.HECRawLogger"/> class.
         /// </summary>
         /// <param name="categoryName">Category name.</param>
-        /// <param name="threshold">Threshold.</param>
         /// <param name="httpClient">Http client.</param>
         /// <param name="batchManager">Batch manager.</param>
         /// <param name="loggerFormatter">Formatter instance.</param>
-        public HECRawLogger(string categoryName, LogLevel threshold, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)
-            : base(categoryName, threshold, httpClient, batchManager, loggerFormatter)
+        public HECRawLogger(string categoryName, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)
+            : base(categoryName, httpClient, batchManager, loggerFormatter)
         {
         }
 
diff --git a/src/SplunkLogger/Loggers/TcpLogger.cs b/src/SplunkLogger/Loggers/TcpLogger.cs
@@ -16,11 +16,10 @@ public class TcpLogger : BaseLogger, ILogger
         /// Initializes a new instance of the <see cref="T:Splunk.Loggers.TcpLogger"/> class.
         /// </summary>
         /// <param name="categoryName">Category name.</param>
-        /// <param name="threshold">Threshold.</param>
         /// <param name="tcpClient">Tcp client.</param>
         /// <param name="loggerFormatter">Formatter instance.</param>
-        public TcpLogger(string categoryName, LogLevel threshold, TcpClient tcpClient, ILoggerFormatter loggerFormatter)
-            : base(categoryName, threshold, loggerFormatter)
+        public TcpLogger(string categoryName, TcpClient tcpClient, ILoggerFormatter loggerFormatter)
+            : base(categoryName, loggerFormatter)
         {
             this.tcpClient = tcpClient;
         }
diff --git a/src/SplunkLogger/Loggers/UdpLogger.cs b/src/SplunkLogger/Loggers/UdpLogger.cs
@@ -16,11 +16,10 @@ public class UdpLogger : BaseLogger, ILogger
         /// Initializes a new instance of the <see cref="T:Splunk.Loggers.UdpLogger"/> class.
         /// </summary>
         /// <param name="categoryName">Category name.</param>
-        /// <param name="threshold">Threshold.</param>
         /// <param name="udpClient">UDP client.</param>
         /// <param name="loggerFormatter">Formatter instance.</param>
-        public UdpLogger(string categoryName, LogLevel threshold, UdpClient udpClient, ILoggerFormatter loggerFormatter)
-            : base(categoryName, threshold, loggerFormatter)
+        public UdpLogger(string categoryName, UdpClient udpClient, ILoggerFormatter loggerFormatter)
+            : base(categoryName, loggerFormatter)
         {
             this.udpClient = udpClient;
         }
diff --git a/src/SplunkLogger/Providers/SplunkHECJsonLoggerProvider.cs b/src/SplunkLogger/Providers/SplunkHECJsonLoggerProvider.cs
@@ -16,7 +16,6 @@ namespace Splunk.Providers
     public class SplunkHECJsonLoggerProvider : SplunkHECBaseProvider, ILoggerProvider
     {
         readonly BatchManager batchController;
-        readonly LogLevel threshold;
         readonly ILoggerFormatter loggerFormatter;
         readonly ConcurrentDictionary<string, ILogger> loggers;
 
@@ -29,8 +28,6 @@ public SplunkHECJsonLoggerProvider(SplunkLoggerConfiguration configuration, ILog
         {
             loggers = new ConcurrentDictionary<string, ILogger>();
 
-            threshold = configuration.Threshold;
-
             this.loggerFormatter = loggerFormatter;
 
             SetupHttpClient(configuration, "event");
@@ -69,7 +66,7 @@ public override void Dispose()
         /// <param name="categoryName">Category name.</param>
         public override ILogger CreateLoggerInstance(string categoryName)
         {
-            return new HECJsonLogger(categoryName, threshold, httpClient, batchController, loggerFormatter);
+            return new HECJsonLogger(categoryName, httpClient, batchController, loggerFormatter);
         }
 
         /// <summary>
diff --git a/src/SplunkLogger/Providers/SplunkHECRawLoggerProvider.cs b/src/SplunkLogger/Providers/SplunkHECRawLoggerProvider.cs
@@ -15,7 +15,6 @@ namespace Splunk.Providers
     public class SplunkHECRawLoggerProvider : SplunkHECBaseProvider, ILoggerProvider
     {
         readonly BatchManager batchManager;
-        readonly LogLevel threshold;
         readonly ILoggerFormatter loggerFormatter;
         readonly ConcurrentDictionary<string, ILogger> loggers;
 
@@ -28,8 +27,6 @@ public SplunkHECRawLoggerProvider(SplunkLoggerConfiguration configuration, ILogg
         {
             loggers = new ConcurrentDictionary<string, ILogger>();
 
-            threshold = configuration.Threshold;
-
             this.loggerFormatter = loggerFormatter;
 
             SetupHttpClient(configuration, "raw");
@@ -68,7 +65,7 @@ public override void Dispose()
         /// <param name="categoryName">Category name.</param>
         public override ILogger CreateLoggerInstance(string categoryName)
         {
-            return new HECRawLogger(categoryName, threshold, httpClient, batchManager, loggerFormatter);
+            return new HECRawLogger(categoryName, httpClient, batchManager, loggerFormatter);
         }
 
         /// <summary>
diff --git a/src/SplunkLogger/Providers/SplunkTcpLoggerProvider.cs b/src/SplunkLogger/Providers/SplunkTcpLoggerProvider.cs
@@ -11,7 +11,6 @@ namespace Splunk.Providers
     /// </summary>
     public class SplunkTcpLoggerProvider : ILoggerProvider
     {
-        readonly LogLevel threshold;
         readonly ILoggerFormatter loggerFormatter;
         readonly ConcurrentDictionary<string, ILogger> loggers;
         readonly TcpClient tcpClient;
@@ -25,8 +24,6 @@ public SplunkTcpLoggerProvider(SplunkLoggerConfiguration configuration, ILoggerF
         {
             loggers = new ConcurrentDictionary<string, ILogger>();
 
-            threshold = configuration.Threshold;
-
             this.loggerFormatter = loggerFormatter;
 
             tcpClient = new TcpClient(configuration.SocketConfiguration.HostName, configuration.SocketConfiguration.Port);
@@ -36,7 +33,7 @@ public SplunkTcpLoggerProvider(SplunkLoggerConfiguration configuration, ILoggerF
 
         ILogger CreateLoggerInstance(string categoryName)
         {
-            return new TcpLogger(categoryName, threshold, tcpClient, loggerFormatter);
+            return new TcpLogger(categoryName, tcpClient, loggerFormatter);
         }
 
         /// <summary>
diff --git a/src/SplunkLogger/Providers/SplunkUdpLoggerProvider.cs b/src/SplunkLogger/Providers/SplunkUdpLoggerProvider.cs
@@ -11,7 +11,6 @@ namespace Splunk.Providers
     /// </summary>
     public class SplunkUdpLoggerProvider : ILoggerProvider
     {
-        readonly LogLevel threshold;
         readonly ILoggerFormatter loggerFormatter;
         readonly ConcurrentDictionary<string, ILogger> loggers;
         readonly UdpClient udpClient;
@@ -25,8 +24,6 @@ public SplunkUdpLoggerProvider(SplunkLoggerConfiguration configuration, ILoggerF
         {
             loggers = new ConcurrentDictionary<string, ILogger>();
 
-            threshold = configuration.Threshold;
-
             this.loggerFormatter = loggerFormatter;
 
             udpClient = new UdpClient(configuration.SocketConfiguration.HostName, configuration.SocketConfiguration.Port);
@@ -36,7 +33,7 @@ public SplunkUdpLoggerProvider(SplunkLoggerConfiguration configuration, ILoggerF
 
         ILogger CreateLoggerInstance(string categoryName)
         {
-            return new UdpLogger(categoryName, threshold, udpClient, loggerFormatter);
+            return new UdpLogger(categoryName, udpClient, loggerFormatter);
         }
 
         /// <summary>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using Microsoft.Extensions.Logging;`
`2`		`-`
	`1`	`+`
`3`	`2`	`namespace Splunk.Configurations`
`4`	`3`	`{`
`5`	`4`	`/// <summary>`
`@@ -16,10 +15,5 @@ public class SplunkLoggerConfiguration`
`16`	`15`	`/// Gets or sets the socket configuration.`
`17`	`16`	`/// </summary>`
`18`	`17`	`public SocketConfiguration SocketConfiguration { get; set; }`
`19`		`-`
`20`		`- /// <summary>`
`21`		`- /// Gets or sets the threshold.`
`22`		`- /// </summary>`
`23`		`- public LogLevel Threshold { get; set; }`
`24`	`18`	`}`
`25`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,18 +11,15 @@ public abstract class BaseLogger : ILogger`
`11`	`11`	`protected readonly ILoggerFormatter loggerFormatter;`
`12`	`12`
`13`	`13`	`readonly string categoryName;`
`14`		`- readonly LogLevel threshold;`
`15`	`14`
`16`	`15`	`/// <summary>`
`17`	`16`	`/// Initializes a new instance of the <see cref="T:Splunk.Loggers.BaseLogger"/> class.`
`18`	`17`	`/// </summary>`
`19`	`18`	`/// <param name="categoryName">Category name.</param>`
`20`		`- /// <param name="threshold">Threshold.</param>`
`21`	`19`	`/// <param name="loggerFormatter">Formatter instance.</param>`
`22`		`- public BaseLogger(string categoryName, LogLevel threshold, ILoggerFormatter loggerFormatter)`
	`20`	`+ public BaseLogger(string categoryName, ILoggerFormatter loggerFormatter)`
`23`	`21`	`{`
`24`	`22`	`this.categoryName = categoryName;`
`25`		`- this.threshold = threshold;`
`26`	`23`	`this.loggerFormatter = loggerFormatter;`
`27`	`24`	`}`
`28`	`25`
`@@ -33,7 +30,7 @@ public BaseLogger(string categoryName, LogLevel threshold, ILoggerFormatter logg`
`33`	`30`	`/// <param name="logLevel">.Net Core Log level.</param>`
`34`	`31`	`public bool IsEnabled(LogLevel logLevel)`
`35`	`32`	`{`
`36`		`- return (int)logLevel >= (int)threshold;`
	`33`	`+ return true;`
`37`	`34`	`}`
`38`	`35`
`39`	`36`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,11 @@ public class HECJsonLogger : HECBaseLogger, ILogger`
`14`	`14`	`/// Initializes a new instance of the <see cref="T:Splunk.Loggers.HECJsonLogger"/> class.`
`15`	`15`	`/// </summary>`
`16`	`16`	`/// <param name="categoryName">Category name.</param>`
`17`		`- /// <param name="threshold">Threshold.</param>`
`18`	`17`	`/// <param name="httpClient">Http client.</param>`
`19`	`18`	`/// <param name="batchManager">Batch manager.</param>`
`20`	`19`	`/// <param name="loggerFormatter">Formatter instance.</param>`
`21`		`- public HECJsonLogger(string categoryName, LogLevel threshold, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)`
`22`		`- : base(categoryName, threshold, httpClient, batchManager, loggerFormatter)`
	`20`	`+ public HECJsonLogger(string categoryName, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)`
	`21`	`+ : base(categoryName, httpClient, batchManager, loggerFormatter)`
`23`	`22`	`{`
`24`	`23`	`}`
`25`	`24`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,11 @@ public class HECRawLogger : HECBaseLogger, ILogger`
`13`	`13`	`/// Initializes a new instance of the <see cref="T:Splunk.Loggers.HECRawLogger"/> class.`
`14`	`14`	`/// </summary>`
`15`	`15`	`/// <param name="categoryName">Category name.</param>`
`16`		`- /// <param name="threshold">Threshold.</param>`
`17`	`16`	`/// <param name="httpClient">Http client.</param>`
`18`	`17`	`/// <param name="batchManager">Batch manager.</param>`
`19`	`18`	`/// <param name="loggerFormatter">Formatter instance.</param>`
`20`		`- public HECRawLogger(string categoryName, LogLevel threshold, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)`
`21`		`- : base(categoryName, threshold, httpClient, batchManager, loggerFormatter)`
	`19`	`+ public HECRawLogger(string categoryName, HttpClient httpClient, BatchManager batchManager, ILoggerFormatter loggerFormatter)`
	`20`	`+ : base(categoryName, httpClient, batchManager, loggerFormatter)`
`22`	`21`	`{`
`23`	`22`	`}`
`24`	`23`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,10 @@ public class TcpLogger : BaseLogger, ILogger`
`16`	`16`	`/// Initializes a new instance of the <see cref="T:Splunk.Loggers.TcpLogger"/> class.`
`17`	`17`	`/// </summary>`
`18`	`18`	`/// <param name="categoryName">Category name.</param>`
`19`		`- /// <param name="threshold">Threshold.</param>`
`20`	`19`	`/// <param name="tcpClient">Tcp client.</param>`
`21`	`20`	`/// <param name="loggerFormatter">Formatter instance.</param>`
`22`		`- public TcpLogger(string categoryName, LogLevel threshold, TcpClient tcpClient, ILoggerFormatter loggerFormatter)`
`23`		`- : base(categoryName, threshold, loggerFormatter)`
	`21`	`+ public TcpLogger(string categoryName, TcpClient tcpClient, ILoggerFormatter loggerFormatter)`
	`22`	`+ : base(categoryName, loggerFormatter)`
`24`	`23`	`{`
`25`	`24`	`this.tcpClient = tcpClient;`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,10 @@ public class UdpLogger : BaseLogger, ILogger`
`16`	`16`	`/// Initializes a new instance of the <see cref="T:Splunk.Loggers.UdpLogger"/> class.`
`17`	`17`	`/// </summary>`
`18`	`18`	`/// <param name="categoryName">Category name.</param>`
`19`		`- /// <param name="threshold">Threshold.</param>`
`20`	`19`	`/// <param name="udpClient">UDP client.</param>`
`21`	`20`	`/// <param name="loggerFormatter">Formatter instance.</param>`
`22`		`- public UdpLogger(string categoryName, LogLevel threshold, UdpClient udpClient, ILoggerFormatter loggerFormatter)`
`23`		`- : base(categoryName, threshold, loggerFormatter)`
	`21`	`+ public UdpLogger(string categoryName, UdpClient udpClient, ILoggerFormatter loggerFormatter)`
	`22`	`+ : base(categoryName, loggerFormatter)`
`24`	`23`	`{`
`25`	`24`	`this.udpClient = udpClient;`
`26`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ namespace Splunk.Providers`
`16`	`16`	`public class SplunkHECJsonLoggerProvider : SplunkHECBaseProvider, ILoggerProvider`
`17`	`17`	`{`
`18`	`18`	`readonly BatchManager batchController;`
`19`		`- readonly LogLevel threshold;`
`20`	`19`	`readonly ILoggerFormatter loggerFormatter;`
`21`	`20`	`readonly ConcurrentDictionary<string, ILogger> loggers;`
`22`	`21`
`@@ -29,8 +28,6 @@ public SplunkHECJsonLoggerProvider(SplunkLoggerConfiguration configuration, ILog`
`29`	`28`	`{`
`30`	`29`	`loggers = new ConcurrentDictionary<string, ILogger>();`
`31`	`30`
`32`		`- threshold = configuration.Threshold;`
`33`		`-`
`34`	`31`	`this.loggerFormatter = loggerFormatter;`
`35`	`32`
`36`	`33`	`SetupHttpClient(configuration, "event");`
`@@ -69,7 +66,7 @@ public override void Dispose()`
`69`	`66`	`/// <param name="categoryName">Category name.</param>`
`70`	`67`	`public override ILogger CreateLoggerInstance(string categoryName)`
`71`	`68`	`{`
`72`		`- return new HECJsonLogger(categoryName, threshold, httpClient, batchController, loggerFormatter);`
	`69`	`+ return new HECJsonLogger(categoryName, httpClient, batchController, loggerFormatter);`
`73`	`70`	`}`
`74`	`71`
`75`	`72`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ namespace Splunk.Providers`
`15`	`15`	`public class SplunkHECRawLoggerProvider : SplunkHECBaseProvider, ILoggerProvider`
`16`	`16`	`{`
`17`	`17`	`readonly BatchManager batchManager;`
`18`		`- readonly LogLevel threshold;`
`19`	`18`	`readonly ILoggerFormatter loggerFormatter;`
`20`	`19`	`readonly ConcurrentDictionary<string, ILogger> loggers;`
`21`	`20`
`@@ -28,8 +27,6 @@ public SplunkHECRawLoggerProvider(SplunkLoggerConfiguration configuration, ILogg`
`28`	`27`	`{`
`29`	`28`	`loggers = new ConcurrentDictionary<string, ILogger>();`
`30`	`29`
`31`		`- threshold = configuration.Threshold;`
`32`		`-`
`33`	`30`	`this.loggerFormatter = loggerFormatter;`
`34`	`31`
`35`	`32`	`SetupHttpClient(configuration, "raw");`
`@@ -68,7 +65,7 @@ public override void Dispose()`
`68`	`65`	`/// <param name="categoryName">Category name.</param>`
`69`	`66`	`public override ILogger CreateLoggerInstance(string categoryName)`
`70`	`67`	`{`
`71`		`- return new HECRawLogger(categoryName, threshold, httpClient, batchManager, loggerFormatter);`
	`68`	`+ return new HECRawLogger(categoryName, httpClient, batchManager, loggerFormatter);`
`72`	`69`	`}`
`73`	`70`
`74`	`71`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ namespace Splunk.Providers`
`11`	`11`	`/// </summary>`
`12`	`12`	`public class SplunkTcpLoggerProvider : ILoggerProvider`
`13`	`13`	`{`
`14`		`- readonly LogLevel threshold;`
`15`	`14`	`readonly ILoggerFormatter loggerFormatter;`
`16`	`15`	`readonly ConcurrentDictionary<string, ILogger> loggers;`
`17`	`16`	`readonly TcpClient tcpClient;`
`@@ -25,8 +24,6 @@ public SplunkTcpLoggerProvider(SplunkLoggerConfiguration configuration, ILoggerF`
`25`	`24`	`{`
`26`	`25`	`loggers = new ConcurrentDictionary<string, ILogger>();`
`27`	`26`
`28`		`- threshold = configuration.Threshold;`
`29`		`-`
`30`	`27`	`this.loggerFormatter = loggerFormatter;`
`31`	`28`
`32`	`29`	`tcpClient = new TcpClient(configuration.SocketConfiguration.HostName, configuration.SocketConfiguration.Port);`
`@@ -36,7 +33,7 @@ public SplunkTcpLoggerProvider(SplunkLoggerConfiguration configuration, ILoggerF`
`36`	`33`
`37`	`34`	`ILogger CreateLoggerInstance(string categoryName)`
`38`	`35`	`{`
`39`		`- return new TcpLogger(categoryName, threshold, tcpClient, loggerFormatter);`
	`36`	`+ return new TcpLogger(categoryName, tcpClient, loggerFormatter);`
`40`	`37`	`}`
`41`	`38`
`42`	`39`	`/// <summary>`