Add more debug logging messages

Author: mythz

src/ServiceStack.Redis/RedisNativeClient_Utils.cs

@@ -92,6 +92,12 @@ private void Connect()
             };
             try
             {
+                if (log.IsDebugEnabled)
+                {
+                    var type = ConnectTimeout <= 0 ? "sync" : "async";
+                    logDebug($"Attempting {type} connection to '{Host}:{Port}' (SEND {SendTimeout}, RECV {ReceiveTimeout} Timeouts)...");
+                }
+                
                 if (ConnectTimeout <= 0)
                 {
                     socket.Connect(Host, Port);
@@ -107,7 +113,7 @@ private void Connect()
                 if (!socket.Connected)
                 {
                     if (log.IsDebugEnabled)
-                        logDebug("Socket Connect failed");
+                        logDebug($"Socket failed connect to '{Host}:{Port}' (ConnectTimeout {ConnectTimeout})");
 
                     socket.Close();
                     socket = null;
@@ -116,7 +122,7 @@ private void Connect()
                 }
 
                 if (log.IsDebugEnabled)
-                    logDebug("Socket Connected");
+                    logDebug($"Socket connected to '{Host}:{Port}'");
 
                 Stream networkStream = new NetworkStream(socket);
 
@@ -169,7 +175,7 @@ private void Connect()
 #endif
 
                     if (!sslStream.IsEncrypted)
-                        throw new Exception("Could not establish an encrypted connection to " + Host);
+                        throw new Exception($"Could not establish an encrypted connection to '{Host}:{Port}'");
 
                     networkStream = sslStream;
                 }

src/ServiceStack.Redis/RedisSentinel.cs

@@ -123,6 +123,8 @@ public class RedisSentinel : IRedisSentinel
         /// </summary>
         public bool ResetWhenObjectivelyDown { get; set; }
 
+        internal string DebugId => $"";
+
         public RedisSentinel(string sentinelHost = null, string masterName = null)
             : this(new[] { sentinelHost ?? DefaultAddress }, masterName ?? DefaultMasterName) { }
 
@@ -287,10 +289,8 @@ private IRedisClientsManager CreateRedisManager(SentinelInfo sentinelInfo)
             return redisManager;
         }
 
-        public IRedisClientsManager GetRedisManager()
-        {
-            return RedisManager ?? (RedisManager = CreateRedisManager(GetSentinelInfo()));
-        }
+        public IRedisClientsManager GetRedisManager() => 
+            RedisManager ??= CreateRedisManager(GetSentinelInfo());
 
         private RedisSentinelWorker GetValidSentinelWorker()
         {
@@ -304,17 +304,30 @@ private RedisSentinelWorker GetValidSentinelWorker()
 
             while (this.worker == null && ShouldRetry())
             {
+                var step = 0;
                 try
                 {
                     this.worker = GetNextSentinel();
+                    step = 1;
                     GetRedisManager();
 
+                    step = 2;
                     this.worker.BeginListeningForConfigurationChanges();
                     this.failures = 0; //reset
                     return this.worker;
                 }
                 catch (RedisException ex)
                 {
+                    if (Log.IsDebugEnabled)
+                    {
+                        var name = step switch {
+                            0 => "GetNextSentinel()",
+                            1 => "GetRedisManager()",
+                            2 => "BeginListeningForConfigurationChanges()",
+                        };
+                        Log.Debug($"Failed to {name}: {ex.Message}");
+                    }
+                    
                     if (OnWorkerError != null)
                         OnWorkerError(ex);
 
@@ -378,6 +391,9 @@ private RedisSentinelWorker GetNextSentinel()
 
                     if (++sentinelIndex >= SentinelEndpoints.Length)
                         sentinelIndex = 0;
+                    
+                    if (Log.IsDebugEnabled)
+                        Log.Debug($"Attempt to connect to next sentinel '{SentinelEndpoints[sentinelIndex]}'...");
 
                     var sentinelWorker = new RedisSentinelWorker(this, SentinelEndpoints[sentinelIndex])
                     {
@@ -443,6 +459,6 @@ public SentinelInfo(string masterName, IEnumerable<string> redisMasters, IEnumer
 
     public override string ToString()
     {
-        return $"{MasterName} masters: {string.Join(", ", RedisMasters)}, slaves: {string.Join(", ", RedisSlaves)}";
+        return $"{MasterName} primary: {string.Join(", ", RedisMasters)}, replicas: {string.Join(", ", RedisSlaves)}";
     }
 }

src/ServiceStack.Redis/RedisSentinelWorker.cs

@@ -173,6 +173,10 @@ public void BeginListeningForConfigurationChanges()
                             //Use BasicRedisResolver which doesn't validate non-Master Sentinel instances
                             RedisResolver = new BasicRedisResolver(sentinel.SentinelEndpoints, sentinel.SentinelEndpoints)
                         };
+                        
+                        if (Log.IsDebugEnabled)
+                            Log.Debug($"Starting subscription to {sentinel.SentinelHosts.ToArray()}, replicas: {sentinel.SentinelHosts.ToArray()}...");
+                        
                         this.sentinePubSub = new RedisPubSubServer(sentinelManager)
                         {
                             HeartbeatInterval = null,
@@ -187,7 +191,7 @@ public void BeginListeningForConfigurationChanges()
             }
             catch (Exception ex)
             {
-                Log.Error($"Error Subscribing to Redis Channel on {this.sentinelClient.Host}:{this.sentinelClient.Port}", ex);
+                Log.Error($"Error Subscribing to Redis Channel on {sentinelClient.Host}:{sentinelClient.Port}", ex);
 
                 if (OnSentinelError != null)
                     OnSentinelError(ex);