From 2468774cb54a7ac381988af6fa8ed0b09264762d Mon Sep 17 00:00:00 2001 From: vnugent Date: Sat, 20 Apr 2024 12:08:58 -0400 Subject: Squashed commit of the following: commit da872f10e7f7578dd5bb28e10cb73c4b8ebbcc07 Author: vnugent Date: Sat Apr 20 12:01:08 2024 -0400 chore: Package update & add http error handler commit 81bda557a5053be9e722ee9e5c43e45f548f2b45 Merge: 33c9fad 41b408d Author: vnugent Date: Tue Apr 9 11:09:34 2024 -0400 Merge branch 'master' into develop commit 33c9fad14891914268d6ad6bb63c880b52b08860 Author: vnugent Date: Mon Apr 8 21:49:25 2024 -0400 refactor: Change connection logging verbosity commit d8e1307252b176112040521f46951a02b5474c80 Author: vnugent Date: Thu Mar 28 16:57:57 2024 -0400 ci(app): Switch to local build deps instead of downloading commit b53fde4d0e9ed7d88e1ac322f455eefe0c9f0dfa Merge: a504435 49c3641 Author: vnugent Date: Sun Mar 24 21:26:58 2024 -0400 Merge branch 'master' into develop commit a504435151efbe1d19404fa44859b15c629f6d5d Author: vnugent Date: Sun Mar 24 20:55:01 2024 -0400 chore: Updated compose and added some more logging commit c74440ff12daa03cc4b7792d0c3baad46a11a465 Author: vnugent Date: Mon Mar 18 21:57:57 2024 -0400 feat: message checksum support & dynamic serializers commit 9983582db08d3e6c456295ea96e482cbb4f31f42 Author: vnugent Date: Sun Mar 10 21:58:28 2024 -0400 source tree project location updated commit 60f09bde87b5c59ef937c62ef64b7745bc3711b5 Merge: 2f75659 e5bb0ee Author: vnugent Date: Sun Mar 10 16:50:09 2024 -0400 Merge remote-tracking branch 'origin/master' into develop commit 2f7565976472f0f056db60520bf253a776112c10 Merge: 323ff67 6b87785 Author: vnugent Date: Sun Mar 10 16:45:23 2024 -0400 merge master commit 323ff67badfc46ad638d75f059d60d9425ccb2fa Author: vnugent Date: Sun Mar 10 15:50:07 2024 -0400 ci(server): Conainerize and add vncache server packages commit 5d4192880654fd6e00e587814169415b42621327 Author: vnugent Date: Sat Mar 9 19:13:21 2024 -0500 chore: #2 Minor fixes and polish before release commit a4b3504bb891829074d1efde0433eae010862181 Author: vnugent Date: Sat Mar 9 16:30:44 2024 -0500 package updates commit 4d8cfc10382105b0acbd94df93ad3d05ff91db54 Author: vnugent Date: Wed Mar 6 21:30:58 2024 -0500 refactor: #2 Centralize server state, default discovery endpoints & more commit 016a96a80cce025a86c6cf26707738f6a2eb2658 Author: vnugent Date: Thu Feb 29 21:22:38 2024 -0500 feat: add future support for memory diagnostics, and some docs commit 456ead9bc8b0f61357bae93152ad0403c4940101 Author: vnugent Date: Tue Feb 13 14:46:35 2024 -0500 fix: #1 shared cluster index on linux & latested core updates commit a481d63f964a5d5204cac2e95141f37f9a28d573 Author: vnugent Date: Tue Jan 23 15:43:50 2024 -0500 cache extension api tweaks --- .../src/VNLib.Data.Caching.Providers.Redis.csproj | 2 +- .../src/FBMCacheClient.cs | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/plugins/VNLib.Data.Caching.Providers.Redis/src/VNLib.Data.Caching.Providers.Redis.csproj b/plugins/VNLib.Data.Caching.Providers.Redis/src/VNLib.Data.Caching.Providers.Redis.csproj index ac5fb63..a896cf8 100644 --- a/plugins/VNLib.Data.Caching.Providers.Redis/src/VNLib.Data.Caching.Providers.Redis.csproj +++ b/plugins/VNLib.Data.Caching.Providers.Redis/src/VNLib.Data.Caching.Providers.Redis.csproj @@ -39,7 +39,7 @@ - + diff --git a/plugins/VNLib.Data.Caching.Providers.VNCache/src/FBMCacheClient.cs b/plugins/VNLib.Data.Caching.Providers.VNCache/src/FBMCacheClient.cs index e84a077..28ccdcd 100644 --- a/plugins/VNLib.Data.Caching.Providers.VNCache/src/FBMCacheClient.cs +++ b/plugins/VNLib.Data.Caching.Providers.VNCache/src/FBMCacheClient.cs @@ -23,6 +23,7 @@ */ using System; +using System.IO; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -255,21 +256,22 @@ namespace VNLib.Data.Caching.Providers.VNCache pluginLog.Verbose("Stack trace: {re}", wse); } //SEs may be raised when the server is not available - catch (HttpRequestException he) when (he.InnerException is SocketException) + catch (HttpRequestException he) when (he.InnerException is SocketException se) { pluginLog.Debug("Failed to connect to random cache server because a TCP connection could not be established"); - pluginLog.Verbose("Stack trace: {re}", he.InnerException); + pluginLog.Verbose("Stack trace: {re}", se); + await Task.Delay(1000, exitToken); } - catch (HttpRequestException he) when (he.StatusCode.HasValue) + catch (HttpRequestException he) when (he.InnerException is IOException ioe && ioe.InnerException is SocketException se) { - pluginLog.Warn("Failed to negotiate with cache server {reason}", he.Message); - pluginLog.Verbose("Stack trace: {re}", he); + pluginLog.Debug("Failed to connect to random cache server because a TCP connection could not be established"); + pluginLog.Verbose("Stack trace: {re}", se); await Task.Delay(1000, exitToken); } - catch(HttpRequestException hre) when (hre.InnerException is SocketException se) + catch (HttpRequestException he) when (he.StatusCode.HasValue) { - pluginLog.Warn("Failed to establish a TCP connection to server {server} {reason}", node.NodeId, se.Message); - pluginLog.Verbose("Stack trace: {re}", se); + pluginLog.Warn("Failed to negotiate with cache server {reason}", he.Message); + pluginLog.Verbose("Stack trace: {re}", he); await Task.Delay(1000, exitToken); } finally -- cgit