don't attempt to reselect db which is already set after connect

Author: mythz

src/ServiceStack.Redis/RedisNativeClient_Utils.cs

@@ -265,8 +265,9 @@ internal bool AssertConnectedSocket()
             }
         }
 
-        private void TryConnectIfNeeded()
+        private bool TryConnectIfNeeded()
         {
+            bool didConnect = false;
             if (LastConnectedAtTimestamp > 0)
             {
                 var now = Stopwatch.GetTimestamp();
@@ -275,24 +276,24 @@ private void TryConnectIfNeeded()
                 if (socket == null || (elapsedSecs > IdleTimeOutSecs && !socket.IsConnected()))
                 {
                     Reconnect();
+                    didConnect = true;
                 }
                 LastConnectedAtTimestamp = now;
             }
 
             if (socket == null)
             {
                 Connect();
+                didConnect = true;
             }
+
+            return didConnect;
         }
 
         private bool Reconnect()
         {
-            var previousDb = db;
-
             SafeConnectionClose();
-            Connect(); //sets db to 0
-
-            if (previousDb != RedisConfig.DefaultDb) this.Db = previousDb;
+            Connect(); //sets db 
 
             return socket != null;
         }
@@ -360,7 +361,7 @@ private static byte[] GetCmdBytes(char cmdPrefix, int noOfLines)
         }
 
         /// <summary>
-        /// Command to set multuple binary safe arguments
+        /// Command to set multiple binary safe arguments
         /// </summary>
         /// <param name="cmdWithBinaryArgs"></param>
         /// <returns></returns>

tests/Console.Tests/BrPopAfterReconnection.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using ServiceStack.Logging;
+using ServiceStack.Redis;
+using ServiceStack.Text;
+
+namespace ConsoleTests
+{
+    public class BrPopAfterReconnection
+    {
+        protected internal static BasicRedisClientManager BasicRedisClientManager;
+        
+        public void Execute()
+        {
+//            RedisConfig.AssumeServerVersion = 4000;
+//            RedisConfig.DisableVerboseLogging = false;
+//            LogManager.LogFactory = new ConsoleLogFactory();
+            
+            var host = "localhost";
+            var port = "6379";
+            var db = "9";
+
+            var redisUri = $"{host}:{port}?db={db}";
+
+            BasicRedisClientManager = new BasicRedisClientManager(redisUri);
+            var queue = "FormSaved";
+
+            while (true)
+            {
+                Task.Run(() => BlockingReceive(queue));
+                Thread.Sleep(1000);
+
+                Console.WriteLine("Restart Redis and press Enter...");
+                Console.ReadLine();
+
+                Console.WriteLine("Enter something:");
+                var item = Console.ReadLine();
+
+                if (!string.IsNullOrWhiteSpace(item))
+                {
+                    using (var client = BasicRedisClientManager.GetClient())
+                    {
+                        client.AddItemToList(queue, item);
+                    }
+
+                    Console.WriteLine("Item added");
+                }
+        
+                Thread.Sleep(1000);
+            }
+        }
+        
+        public static void BlockingReceive(string queue)
+        {
+            using (var client = BasicRedisClientManager.GetReadOnlyClient())
+            {
+                Console.WriteLine($"Listening to {queue}");
+
+                var fromList = client.BlockingPopItemFromList(queue, TimeSpan.FromSeconds(60));
+           
+                Console.WriteLine($"Received:{fromList.Dump()}");
+            }
+        }
+    }
+}

tests/Console.Tests/Console.Tests.csproj

@@ -55,7 +55,19 @@
       <HintPath>..\..\lib\net45\ServiceStack.Text.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\..\src\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Core" />
+    <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
+      <HintPath>..\..\src\packages\System.Memory.4.5.1\lib\netstandard1.1\System.Memory.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\src\packages\System.Runtime.CompilerServices.Unsafe.4.5.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -64,6 +76,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BlockingPop.cs" />
+    <Compile Include="BrPopAfterReconnection.cs" />
     <Compile Include="ForceFailover.cs" />
     <Compile Include="MasterFailoverWithPassword.cs" />
     <Compile Include="NetworkRedisSentinelFailoverTests.cs" />
@@ -84,6 +97,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

tests/Console.Tests/Program.cs

@@ -36,7 +36,9 @@ static void Main(string[] args)
 
             //new BlockingPop().Execute();
 
-            new MasterFailoverWithPassword().Execute();
+            //new MasterFailoverWithPassword().Execute();
+            
+            new BrPopAfterReconnection().Execute();
         }
     }
 }

tests/Console.Tests/packages.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.Buffers" version="4.4.0" targetFramework="net45" />
+  <package id="System.Memory" version="4.5.1" targetFramework="net45" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net45" />
+</packages>