fix(real time read): added reconnect timeout loop and updated log levels

resolves PRODSUP-4052
naveego · May 25, 2023 · 4fd2816 · 4fd2816
1 parent c9f7947
commit 4fd2816
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/PluginSalesforce/API/Factory/PushTopicConnection.cs b/PluginSalesforce/API/Factory/PushTopicConnection.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using CometD.NetCore.Client;
 using Naveego.Sdk.Logging;
 using Naveego.Sdk.Plugins;
@@ -13,6 +14,8 @@ public class PushTopicConnection
         private readonly Listener _listener = null;
         private readonly string _channel = "";
 
+        private CancellationTokenSource _cts;
+
         public PushTopicConnection(BayeuxClient bayeuxClient, string channel)
         {
             _bayeuxClient = bayeuxClient;
@@ -21,6 +24,11 @@ public PushTopicConnection(BayeuxClient bayeuxClient, string channel)
         }
         public void Connect()
         {
+            // force the client to reconnect after 30 minutes
+            _cts = new CancellationTokenSource();
+            _cts.CancelAfter(1800 * 1000);
+
+            // connect the client
             _bayeuxClient.Handshake();
             _bayeuxClient.WaitFor(1000, new[] { BayeuxClient.State.CONNECTED });
             _bayeuxClient.GetChannel(_channel).Subscribe(_listener);
@@ -34,7 +42,13 @@ public void Disconnect()
 
         public async IAsyncEnumerable<string> GetCurrentMessages()
         {
+            if (_cts.IsCancellationRequested) {
+                Logger.Debug("request to disconnect stream requested");
+                Disconnect();
+            }
+
             if (!_bayeuxClient.Connected) {
+                Logger.Debug("request to connect stream requested");
                 Connect();
             }
 

diff --git a/PluginSalesforce/API/Utility/Listener.cs b/PluginSalesforce/API/Utility/Listener.cs
@@ -13,7 +13,7 @@ public void OnMessage(IClientSessionChannel channel, IMessage message)
         {
             var convertedJson = message.Json;
             _messages.Add(convertedJson);
-            Logger.Info($"Got message: {convertedJson}");
+            Logger.Debug($"Got message: {convertedJson}");
         }
 
         public void ClearStoredMessages()

diff --git a/PluginSalesforce/DataContracts/RealTimeEvent.cs b/PluginSalesforce/DataContracts/RealTimeEvent.cs
@@ -28,7 +28,7 @@ public class RealTimeEvent
         public DateTime CreatedDate { get; set; }
 
         [JsonProperty("replayId")]
-        public Int32 ReplayId { get; set; }
+        public long ReplayId { get; set; }
 
         [JsonProperty("type")]
         public string Type { get; set; }