Merge pull request #180 from nblumhardt/limit-pooled-connection-lifetime

Limit the default pooled connection lifetime on .NET 5 and greater
datalust · Sep 12, 2022 · 386b044 · 386b044
2 parents c856c94 + 042e79c
commit 386b044
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.csproj b/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <DefineConstants>$(DefineConstants);DURABLE;THREADING_TIMER;WRITE_ALL_BYTES_ASYNC</DefineConstants>
+    <DefineConstants>$(DefineConstants);DURABLE;THREADING_TIMER;WRITE_ALL_BYTES_ASYNC;SOCKETS_HTTP_HANDLER_ALWAYS_DEFAULT</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net4.5' ">

diff --git a/src/Serilog.Sinks.Seq/Sinks/Seq/Http/SeqIngestionApiClient.cs b/src/Serilog.Sinks.Seq/Sinks/Seq/Http/SeqIngestionApiClient.cs
@@ -36,7 +36,23 @@ public SeqIngestionApiClient(string serverUrl, string? apiKey, HttpMessageHandle
         {
             if (serverUrl == null) throw new ArgumentNullException(nameof(serverUrl));
             _apiKey = apiKey;
-            _httpClient = messageHandler != null ? new HttpClient(messageHandler) : new HttpClient();
+            _httpClient = messageHandler != null
+                    ? new HttpClient(messageHandler)
+                    :
+#if SOCKETS_HTTP_HANDLER_ALWAYS_DEFAULT
+                    new HttpClient(new SocketsHttpHandler
+                    {
+                        // The default value is infinite; this causes problems for long-running processes if DNS changes
+                        // require that the Seq API be accessed at a different IP address. Setting a timeout here puts
+                        // an upper bound on the duration of DNS-related outages, while hopefully incurring only infrequent
+                        // connection reestablishment costs.
+                        PooledConnectionLifetime = TimeSpan.FromMinutes(5)
+                    })
+#else
+                    new HttpClient()
+#endif
+                ;
+
             _httpClient.BaseAddress = new Uri(NormalizeServerBaseAddress(serverUrl));
         }