From 41b408d29bcc2a7b6d5d2a91d438b1bf4190907e Mon Sep 17 00:00:00 2001 From: vnugent Date: Tue, 9 Apr 2024 11:09:08 -0400 Subject: Squashed commit of the following: 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 --- plugins/ObjectCacheServer/src/Endpoints/ConnectEndpoint.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'plugins/ObjectCacheServer/src/Endpoints/ConnectEndpoint.cs') diff --git a/plugins/ObjectCacheServer/src/Endpoints/ConnectEndpoint.cs b/plugins/ObjectCacheServer/src/Endpoints/ConnectEndpoint.cs index 42f406a..20d1836 100644 --- a/plugins/ObjectCacheServer/src/Endpoints/ConnectEndpoint.cs +++ b/plugins/ObjectCacheServer/src/Endpoints/ConnectEndpoint.cs @@ -25,6 +25,7 @@ using System; using System.Net; using System.Threading; +using System.Diagnostics; using System.Threading.Tasks; using System.Collections.Generic; @@ -224,7 +225,8 @@ namespace VNLib.Data.Caching.ObjectCache.Server.Endpoints MaxResponseBufferSize = (int)MemoryUtil.NearestPage(maxMessageSizeClamp), NodeId = nodeId, - Advertisment = discoveryAd + Advertisment = discoveryAd, + Address = entity.TrustedRemoteIp, }; } catch (KeyNotFoundException) @@ -243,8 +245,9 @@ namespace VNLib.Data.Caching.ObjectCache.Server.Endpoints private async Task WebsocketAcceptedAsync(WebSocketSession wss) { WsUserState state = wss.UserState!; + Debug.Assert(state != null, "User state is null"); - Log.Debug("Client established websocket connection {sid}", wss.SocketID); + Log.Information("{sid} established websocket connection", state.Address); //Notify peers of new connection Peers.OnPeerConnected(state); @@ -309,7 +312,7 @@ namespace VNLib.Data.Caching.ObjectCache.Server.Endpoints //Notify monitor of disconnect Peers.OnPeerDisconnected(state); - Log.Debug("Client websocket disconnected {sid}", wss.SocketID); + Log.Information("{sid} websocket disconnected", state.Address); } @@ -321,6 +324,7 @@ namespace VNLib.Data.Caching.ObjectCache.Server.Endpoints public int MaxResponseBufferSize { get; init; } public string? NodeId { get; init; } public CacheNodeAdvertisment? Advertisment { get; init; } + public IPAddress Address { get; init; } public bool IsPeer => !string.IsNullOrWhiteSpace(NodeId); -- cgit