log repetition filter, more dep clear

Aurora-RGB · Aug 16, 2023 · 532cf5b · 532cf5b
1 parent 511dbf4
commit 532cf5b
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 66 deletions.
diff --git a/Project-Aurora/ColorBox/ColorBox.csproj b/Project-Aurora/ColorBox/ColorBox.csproj
@@ -19,10 +19,6 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-
   <ItemGroup>
     <Content Include="LICENSE.txt" />
   </ItemGroup>

diff --git a/Project-Aurora/Project-Aurora/Global.cs b/Project-Aurora/Project-Aurora/Global.cs
@@ -61,6 +61,7 @@ public static void Initialize()
         var logPath = Path.Combine(AppDataDirectory, "Logs", logFile);
         logger = new LoggerConfiguration()
             .Enrich.FromLogContext()
+            .Filter.UniqueOverSpan("true", TimeSpan.FromSeconds(30))
             .WriteTo.File(logPath,
                 rollingInterval: RollingInterval.Infinite,
                 fileSizeLimitBytes: 25 * 1000000,  //25 MB

diff --git a/Project-Aurora/Project-Aurora/NLog.config b/Project-Aurora/Project-Aurora/NLog.config
diff --git a/Project-Aurora/Project-Aurora/Project-Aurora.csproj b/Project-Aurora/Project-Aurora/Project-Aurora.csproj
@@ -43,14 +43,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>.\x64\OmenFourZoneLighting.dll</HintPath>
     </Reference>
-
-    <!--
-    <Reference Include="RazerSdkReader">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>.\x64\RazerSdkReader.dll</HintPath>
-    </Reference>
-    -->
-
     <Reference Include="Roccat-Talk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>.\x64\Roccat-Talk.dll</HintPath>
@@ -109,6 +101,7 @@
     <PackageReference Include="RGB.NET.Devices.SteelSeries" Version="2.0.0-prerelease.83" />
     <PackageReference Include="RGB.NET.Devices.Wooting" Version="2.0.0-prerelease.83" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />
+    <PackageReference Include="Serilog.Aggregating.Filter" Version="1.1.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
@@ -153,21 +146,6 @@
     <ProjectReference Include="..\ColorBox\ColorBox.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="NLog.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="ver_minor.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Update="kb_layouts\Extra Features\2led_headset.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="kb_layouts\Extra Features\chroma.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="RGB.NET.Core.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/Project-Aurora/Project-Aurora/packages.lock.json b/Project-Aurora/Project-Aurora/packages.lock.json
@@ -240,6 +240,17 @@
         "resolved": "2.0.2",
         "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
       },
+      "Serilog.Aggregating.Filter": {
+        "type": "Direct",
+        "requested": "[1.1.0, )",
+        "resolved": "1.1.0",
+        "contentHash": "A1OpQMo4dIZlUBGV+4nVQhPy72cy06Xx78G6PbfrCPaw3nvyRAhZ73dheKDMsswCtSq98NZvDFZYMb0VakpK9Q==",
+        "dependencies": {
+          "Serilog": "2.8.0",
+          "Serilog.Filters.Expressions": "2.0.0",
+          "System.Runtime.Caching": "4.5.0"
+        }
+      },
       "Serilog.Sinks.Console": {
         "type": "Direct",
         "requested": "[4.1.0, )",
@@ -744,6 +755,16 @@
         "resolved": "2.10.0",
         "contentHash": "+QX0hmf37a0/OZLxM3wL7V6/ADvC1XihXN4Kq/p6d8lCPfgkRdiuhbWlMaFjR9Av0dy5F0+MBeDmDdRZN/YwQA=="
       },
+      "Serilog.Filters.Expressions": {
+        "type": "Transitive",
+        "resolved": "2.0.0",
+        "contentHash": "JhD2uV1s3ixF4L2dSB7t7jV5OKG8AEQOYtfTqSVkNm9X/g6zr1uoGH62XhDfCzEbyd5fiB9Rv4IXm+8m98Ao9Q==",
+        "dependencies": {
+          "NETStandard.Library": "1.6.1",
+          "Serilog": "2.7.1",
+          "Superpower": "2.0.0"
+        }
+      },
       "SharpDX": {
         "type": "Transitive",
         "resolved": "4.2.0",
@@ -761,6 +782,14 @@
           "SharpDX": "4.2.0"
         }
       },
+      "Superpower": {
+        "type": "Transitive",
+        "resolved": "2.0.0",
+        "contentHash": "LvsFRxO7VJuUXiaIr3agLuTQTCVYtzgmGJ4BiNe4/DKplOMZ4pibpVSg1ON5zXdCci1jYNfRgQlNEKv0d0Kcog==",
+        "dependencies": {
+          "NETStandard.Library": "1.6.0"
+        }
+      },
       "System.AppContext": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -869,6 +898,15 @@
           "System.Composition.Runtime": "6.0.0"
         }
       },
+      "System.Configuration.ConfigurationManager": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "UIFvaFfuKhLr9u5tWMxmVoDPkFeD+Qv8gUuap4aZgVGYSYMdERck4OhLN/2gulAc0nYTEigWXSJNNWshrmxnng==",
+        "dependencies": {
+          "System.Security.Cryptography.ProtectedData": "4.5.0",
+          "System.Security.Permissions": "4.5.0"
+        }
+      },
       "System.Console": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -1264,6 +1302,15 @@
           "Microsoft.NETCore.Targets": "1.1.0"
         }
       },
+      "System.Runtime.Caching": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "95j9KShuaAENf2gLbQ/9YoJDHIWAnoaFYA71xo4QVQyLkOMginn34cD1+6RcYIrqJamLkMXgvgUnOzwzBk+U0w==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.0.0",
+          "System.Configuration.ConfigurationManager": "4.5.0"
+        }
+      },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
         "resolved": "6.0.0",
@@ -1448,6 +1495,11 @@
           "System.Threading.Tasks": "4.3.0"
         }
       },
+      "System.Security.Cryptography.ProtectedData": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q=="
+      },
       "System.Security.Cryptography.X509Certificates": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -1480,6 +1532,14 @@
           "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
         }
       },
+      "System.Security.Permissions": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "9gdyuARhUR7H+p5CjyUB/zPk7/Xut3wUSP8NJQB6iZr8L3XUXTMdoLeVAg9N4rqF8oIpE7MpdqHdDHQ7XgJe0g==",
+        "dependencies": {
+          "System.Security.AccessControl": "4.5.0"
+        }
+      },
       "System.Security.Principal.Windows": {
         "type": "Transitive",
         "resolved": "5.0.0",
@@ -2281,6 +2341,15 @@
           "runtime.any.System.Runtime": "4.3.0"
         }
       },
+      "System.Runtime.Caching": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "95j9KShuaAENf2gLbQ/9YoJDHIWAnoaFYA71xo4QVQyLkOMginn34cD1+6RcYIrqJamLkMXgvgUnOzwzBk+U0w==",
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "2.0.0",
+          "System.Configuration.ConfigurationManager": "4.5.0"
+        }
+      },
       "System.Runtime.Extensions": {
         "type": "Transitive",
         "resolved": "4.3.0",
@@ -2438,6 +2507,11 @@
           "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
         }
       },
+      "System.Security.Cryptography.ProtectedData": {
+        "type": "Transitive",
+        "resolved": "4.5.0",
+        "contentHash": "wLBKzFnDCxP12VL9ANydSYhk59fC4cvOr9ypYQLPnAj48NQIhqnjdD2yhP8yEKyBJEjERWS9DisKL7rX5eU25Q=="
+      },
       "System.Security.Cryptography.X509Certificates": {
         "type": "Transitive",
         "resolved": "4.3.0",