Allow disabling LogAnonymizer in server config

MiloradLalovic · Jan 10, 2023 · 6d5e723 · 6d5e723
1 parent d949207
commit 6d5e723
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 * Update: Optimizing UDP Processing
 * Update: Reporting improved; prevent too many duplicate errors
 * Fix: File Access Server throw access voliatile randomly
+* Feature: Allow disabling LogAnonymizer in server config
 
 # v2.6.331
 ### Client

diff --git a/VpnHood.Server.Access/ServerConfig.cs b/VpnHood.Server.Access/ServerConfig.cs
@@ -12,14 +12,14 @@ public class ServerConfig
 
     [JsonPropertyName("Session")]
     public SessionOptions SessionOptions { get; set; } = new();
-
     public string ConfigCode { get; set; } = string.Empty;
 
     [JsonConverter(typeof(ArrayConverter<IPEndPoint, IPEndPointConverter>))]
-    public IPEndPoint[] TcpEndPoints { get; set; } = new IPEndPoint[] { new(IPAddress.Any, 443), new(IPAddress.IPv6Any, 443) };
+    public IPEndPoint[] TcpEndPoints { get; set; } = { new(IPAddress.Any, 443), new(IPAddress.IPv6Any, 443) };
 
     [JsonConverter(typeof(TimeSpanConverter))]
     public TimeSpan UpdateStatusInterval { get; set; } = TimeSpan.FromSeconds(120);
     public int? MinCompletionPortThreads { get; set; }
     public int? MaxCompletionPortThreads { get; set; }
+    public bool LogAnonymizer { get; set; } = true;
 }
diff --git a/VpnHood.Server.App.Net/ServerApp.cs b/VpnHood.Server.App.Net/ServerApp.cs
@@ -201,6 +201,9 @@ private void StartServer(CommandLineApplication cmdApp)
         cmdApp.Description = "Run the server (default command)";
         cmdApp.OnExecuteAsync(async (cancellationToken) =>
         {
+            // LogAnonymizer is on by default
+            VhLogger.IsAnonymousMode = AppSettings.ServerConfig?.LogAnonymizer ?? true;
+
             // find listener port
             if (IsAnotherInstanceRunning())
                 throw new AnotherInstanceIsRunning();

diff --git a/VpnHood.Server/VpnHoodServer.cs b/VpnHood.Server/VpnHoodServer.cs
@@ -65,7 +65,7 @@ private static void ConfigMinIoThreads(int? minCompletionPortThreads)
         if (minCompletionPortThreads != 0) newMinCompletionPortThreads = minCompletionPortThreads.Value;
         ThreadPool.SetMinThreads(minWorkerThreads, newMinCompletionPortThreads);
         VhLogger.Instance.LogInformation(
-            "MinWorkerThreads: {MinWorkerThreads}, MinCompletionPortThreads: {newMinCompletionPortThreads}", 
+            "MinWorkerThreads: {MinWorkerThreads}, MinCompletionPortThreads: {newMinCompletionPortThreads}",
             minWorkerThreads, newMinCompletionPortThreads);
     }
 
@@ -158,6 +158,7 @@ private async Task Configure()
             _lastConfigCode = serverConfig.ConfigCode;
             ConfigMinIoThreads(serverConfig.MinCompletionPortThreads);
             ConfigMaxIoThreads(serverConfig.MaxCompletionPortThreads);
+            VhLogger.IsAnonymousMode = serverConfig.LogAnonymizer;
 
             // starting the listeners
             var verb = _tcpHost.IsStarted ? "Restarting" : "Starting";

diff --git a/VpnHood.sln.DotSettings b/VpnHood.sln.DotSettings
@@ -5,6 +5,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Analytics/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=anony/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Anonymize/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Anonymizer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=appsettings/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Argb/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Cryptor/@EntryIndexedValue">True</s:Boolean>