diff --git a/Client.Core/Client.Core.csproj b/Client.Core/Client.Core.csproj index 255d140f0..5218d290b 100644 --- a/Client.Core/Client.Core.csproj +++ b/Client.Core/Client.Core.csproj @@ -40,7 +40,7 @@ - + diff --git a/Client.Core/Internal/RestSharpExtensions.cs b/Client.Core/Internal/RestSharpExtensions.cs index fcb01b114..5a3e7f6cc 100644 --- a/Client.Core/Internal/RestSharpExtensions.cs +++ b/Client.Core/Internal/RestSharpExtensions.cs @@ -40,7 +40,7 @@ internal static RestRequest AddAdvancedResponseHandler(this RestRequest restRequ internal static RestResponse ExecuteSync(this RestClient client, RestRequest request, CancellationToken cancellationToken = default) { - return client.Execute(request, cancellationToken); + return client.ExecuteAsync(request, cancellationToken).Result; } } } \ No newline at end of file diff --git a/Client.Legacy/FluxClient.cs b/Client.Legacy/FluxClient.cs index 1c6e935dd..ec8267a17 100644 --- a/Client.Legacy/FluxClient.cs +++ b/Client.Legacy/FluxClient.cs @@ -165,7 +165,7 @@ public FluxClient(FluxConnectionOptions options) : base(new FluxResultMapper()) var version = AssemblyHelper.GetVersion(typeof(FluxClient)); var restClientOptions = new RestClientOptions(options.Url) { - MaxTimeout = (int)options.Timeout.TotalMilliseconds, + Timeout = TimeSpan.FromMilliseconds(options.Timeout.TotalMilliseconds), UserAgent = $"influxdb-client-csharp/{version}", Proxy = options.WebProxy }; @@ -372,9 +372,9 @@ public LogLevel GetLogLevel() public void Dispose() { - // - // Dispose HttpClient - // + // + // Dispose HttpClient + // RestClient.Dispose(); } diff --git a/Client.Test/InfluxDbClientFactoryTest.cs b/Client.Test/InfluxDbClientFactoryTest.cs index 3bb3dfcef..01bc7a314 100644 --- a/Client.Test/InfluxDbClientFactoryTest.cs +++ b/Client.Test/InfluxDbClientFactoryTest.cs @@ -140,7 +140,7 @@ public void LoadFromConnectionString() Assert.AreEqual(LogLevel.Headers, _client.GetLogLevel()); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(1_000, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(1_000, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); } [Test] @@ -160,7 +160,7 @@ public void LoadFromConnectionStringFactory() Assert.AreEqual(LogLevel.Headers, _client.GetLogLevel()); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(1_000, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(1_000, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); } [Test] @@ -178,7 +178,7 @@ public void LoadFromConnectionStringUnitsMillisecondsSeconds() Assert.AreEqual(LogLevel.Headers, _client.GetLogLevel()); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(1, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(1, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); } [Test] @@ -197,7 +197,7 @@ public void LoadFromConnectionStringUnitsMillisecondsSecondsFactory() Assert.AreEqual(LogLevel.Headers, _client.GetLogLevel()); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(1, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(1, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); } [Test] @@ -215,7 +215,7 @@ public void LoadFromConnectionStringUnitsMinutes() Assert.AreEqual(LogLevel.Headers, _client.GetLogLevel()); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(1, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(1, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); } [Test] @@ -234,7 +234,7 @@ public void LoadFromConnectionStringUnitsMinutesFactory() Assert.AreEqual(LogLevel.Headers, _client.GetLogLevel()); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(1, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(1, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); } [Test] @@ -297,7 +297,7 @@ public void LoadFromConfiguration() Assert.AreEqual(LogLevel.Body, _client.GetLogLevel()); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(10_000, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(10_000, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); var defaultTags = GetDeclaredField>(options.PointSettings.GetType(), options.PointSettings, "_defaultTags"); @@ -324,7 +324,7 @@ public void LoadFromConfigurationOptions() Assert.AreEqual(LogLevel.Body, _client.GetLogLevel()); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(10_000, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(10_000, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); var defaultTags = GetDeclaredField>(options.PointSettings.GetType(), options.PointSettings, "_defaultTags"); @@ -416,7 +416,7 @@ public void Timeout() _client = new InfluxDBClient(options); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(20_000, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(20_000, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); } [Test] @@ -432,7 +432,7 @@ public void TimeoutFactory() _client = InfluxDBClientFactory.Create(options); var apiClient = GetDeclaredField(_client.GetType(), _client, "_apiClient"); - Assert.AreEqual(20_000, apiClient.RestClientOptions.MaxTimeout); + Assert.AreEqual(20_000, apiClient.RestClientOptions.Timeout.GetValueOrDefault().TotalMilliseconds); } [Test] diff --git a/Client/Internal/ApiClient.cs b/Client/Internal/ApiClient.cs index a072a2e33..39b64c597 100644 --- a/Client/Internal/ApiClient.cs +++ b/Client/Internal/ApiClient.cs @@ -38,7 +38,7 @@ public ApiClient(InfluxDBClientOptions options, LoggingHandler loggingHandler, G var version = AssemblyHelper.GetVersion(typeof(InfluxDBClient)); RestClientOptions = new RestClientOptions(options.Url) { - MaxTimeout = (int)options.Timeout.TotalMilliseconds, + Timeout = TimeSpan.FromMilliseconds(options.Timeout.TotalMilliseconds), UserAgent = $"influxdb-client-csharp/{version}", Proxy = options.WebProxy, FollowRedirects = options.AllowHttpRedirects, pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy