Don't kill us if we're the thread that's retrying to Start() after a …

…failure.
msarchet · Jun 13, 2013 · c20ab14 · c20ab14
1 parent 7e1e8ca
commit c20ab14
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/src/ServiceStack.Redis/Messaging/RedisMqServer.cs b/src/ServiceStack.Redis/Messaging/RedisMqServer.cs
@@ -237,19 +237,30 @@ public void Start()
 
                     SleepBackOffMultiplier(Interlocked.CompareExchange(ref noOfContinuousErrors, 0, 0));
 
-                    KillBgThreadIfExists();
+                    StartWorkerThreads();
 
-                    bgThread = new Thread(RunLoop) {
-                        IsBackground = true,
-                        Name = "Redis MQ Server " + Interlocked.Increment(ref bgThreadCount)
-                    };
-                    bgThread.Start();
-                    Log.Debug("Started Background Thread: " + bgThread.Name);
+                    //Don't kill us if we're the thread that's retrying to Start() after a failure.
+                    if (bgThread != Thread.CurrentThread)
+                    {
+                        KillBgThreadIfExists();
 
-                    StartWorkerThreads();
+                        bgThread = new Thread(RunLoop)
+                        {
+                            IsBackground = true,
+                            Name = "Redis MQ Server " + Interlocked.Increment(ref bgThreadCount)
+                        };
+                        bgThread.Start();
+                        Log.Debug("Started Background Thread: " + bgThread.Name);
+                    }
+                    else
+                    {
+                        Log.Debug("Retrying RunLoop() on Thread: " + bgThread.Name);
+                        RunLoop();
+                    }
                 }
                 catch (Exception ex)
                 {
+                    ex.Message.Print();
                     if (this.ErrorHandler != null) this.ErrorHandler(ex);
                 }
             }