Grr

DMXControl · Apr 11, 2024 · 270fa95 · 270fa95
1 parent 04fadb2
commit 270fa95
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 14 deletions.
diff --git a/ArtNetSharp/ArtNet.cs b/ArtNetSharp/ArtNet.cs
@@ -270,9 +270,8 @@ internal async Task TrySendBroadcastPacket(AbstractArtPacketCore packet)
 
         private ArtNet()
         {
-#if DEBUG
             ApplicationLogging.LoggerFactory = Tools.LoggerFactory;
-#endif
+
             Logger = ApplicationLogging.CreateLogger<ArtNet>();
             Logger.LogTrace("Initialized!");
 
@@ -289,10 +288,9 @@ private ArtNet()
             networkClients.Clear();
         }
 
-        public static void SetLoggerFectory(ILoggerFactory loggerFactory)
+        public static void AddLoggrovider(ILoggerProvider loggerProvider)
         {
-            Tools.LoggerFactory = loggerFactory;
-            ApplicationLogging.LoggerFactory = loggerFactory;
+            Tools.LoggerFactory.AddProvider(loggerProvider);
         }
 
         private void _updateNetworkClientsTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)

diff --git a/ArtNetTests/HardwareTests/Showtec_Net2.cs b/ArtNetTests/HardwareTests/Showtec_Net2.cs
@@ -46,6 +46,7 @@ public async Task SetUp()
         {
             if (!await IsPingable())
                 return;
+            ArtNet.AddLoggrovider(TestLoggerProvider.Instance);
 
             instance = new ControllerInstanceMock
             {

diff --git a/ArtNetTests/HardwareTests/WirelessSolution_BlueBox.cs b/ArtNetTests/HardwareTests/WirelessSolution_BlueBox.cs
@@ -44,6 +44,7 @@ public async Task SetUp()
         {
             if (!await IsPingable())
                 return;
+            ArtNet.AddLoggrovider(TestLoggerProvider.Instance);
 
             var broadcastIp = new IPAddress(new byte[] { 2, 255, 255, 255 });
             ArtNet.Instance.NetworkClients.ToList().ForEach(ncb => ncb.Enabled = IPAddress.Equals(broadcastIp, ncb.BroadcastIpAddress));

diff --git a/ArtNetTests/NetworkTest.cs b/ArtNetTests/NetworkTest.cs
@@ -18,6 +18,7 @@ public void OneTimeSetUp()
 #if DEBUG
             Assert.Ignore("Skiped in Release!");
 #endif
+            ArtNet.AddLoggrovider(TestLoggerProvider.Instance);
             artNet = ArtNet.Instance;
             var broadcastIp = new IPAddress(new byte[] { 2, 255, 255, 255 });
             artNet.NetworkClients.ToList().ForEach(ncb => ncb.Enabled = IPAddress.Equals(broadcastIp, ncb.BroadcastIpAddress));

diff --git a/ArtNetTests/ObjectTypesTests.cs b/ArtNetTests/ObjectTypesTests.cs
@@ -8,7 +8,7 @@ public class ObjectTypesTests
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            ArtNet.SetLoggerFectory(TestLoggerFactory.Instance);
+            ArtNet.AddLoggrovider(TestLoggerProvider.Instance);
         }
         [SetUp]
         public void Setup()

diff --git a/ArtNetTests/PackagesSerializeDeserialize.cs b/ArtNetTests/PackagesSerializeDeserialize.cs
@@ -10,7 +10,7 @@ public class PackagesSerializeDeserialize
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            ArtNet.SetLoggerFectory(TestLoggerFactory.Instance);
+            ArtNet.AddLoggrovider(TestLoggerProvider.Instance);
         }
 
 

diff --git a/ArtNetTests/SendDMXTest.cs b/ArtNetTests/SendDMXTest.cs
@@ -13,7 +13,7 @@ public class SendDMXTest
         [OneTimeSetUp]
         public void OneTimeSetUp()
         {
-            ArtNet.SetLoggerFectory(TestLoggerFactory.Instance);
+            ArtNet.AddLoggrovider(TestLoggerProvider.Instance);
         }
         [SetUp]
         public void Setup()

diff --git a/ArtNetTests/TestLoggerFactory.cs → ArtNetTests/TestLoggerProvider.cs b/ArtNetTests/TestLoggerFactory.cs → ArtNetTests/TestLoggerProvider.cs
@@ -3,12 +3,9 @@
 
 namespace ArtNetTests
 {
-    internal class TestLoggerFactory
-    {
-        internal static readonly ILoggerFactory Instance = new LoggerFactory([new TestLoggerProvider()]);
-    }
     internal class TestLoggerProvider : ILoggerProvider
     {
+        internal static readonly ILoggerProvider Instance = new TestLoggerProvider();
         public ILogger CreateLogger(string categoryName)
         {
             return new ConsoleLogger(categoryName);

diff --git a/ArtNetTests/TestOS.cs b/ArtNetTests/TestOS.cs
@@ -14,9 +14,9 @@ public class TestOS
         ArtNet artNet;
         [OneTimeSetUp]
         public void Setup()
-        {            
+        {
+            ArtNet.AddLoggrovider(TestLoggerProvider.Instance);
             artNet = ArtNet.Instance;
-            ArtNet.SetLoggerFectory(TestLoggerFactory.Instance);
 
             nodeInstance = new NodeMock();
             nodeInstance.Name = "Test Node";