Change status to Stopping before UnSubscribeFromAllChannels, Stopped after

Author: mythz

src/ServiceStack.Redis/RedisPubSubServer.cs

@@ -258,13 +258,21 @@ private void RunLoop()
                                     switch (op)
                                     {
                                         case Operation.Stop:
-                                            Log.Debug("Stop Command Issued");
-
-                                            if (Interlocked.CompareExchange(ref status, Status.Stopped, Status.Started) != Status.Started)
+                                            if (Log.IsDebugEnabled)
+                                                Log.Debug("Stop Command Issued");
+
+                                            Interlocked.CompareExchange(ref status, Status.Stopping, Status.Started);
+                                            try
+                                            {
+                                                if (Log.IsDebugEnabled)
+                                                    Log.Debug("UnSubscribe From All Channels...");
+
+                                                subscription.UnSubscribeFromAllChannels(); //Un block thread.
+                                            }
+                                            finally
+                                            {
                                                 Interlocked.CompareExchange(ref status, Status.Stopped, Status.Stopping);
-
-                                            Log.Debug("UnSubscribe From All Channels...");
-                                            subscription.UnSubscribeFromAllChannels(); //Un block thread.
+                                            }
                                             return;
 
                                         case Operation.Reset:
@@ -449,7 +457,8 @@ private void SleepBackOffMultiplier(int continuousErrorsCount)
                 rand.Next((int)Math.Pow(continuousErrorsCount, 3), (int)Math.Pow(continuousErrorsCount + 1, 3) + 1),
                 MaxSleepMs);
 
-            Log.Debug("Sleeping for {0}ms after {1} continuous errors".Fmt(nextTry, continuousErrorsCount));
+            if (Log.IsDebugEnabled)
+                Log.Debug("Sleeping for {0}ms after {1} continuous errors".Fmt(nextTry, continuousErrorsCount));
 
             Thread.Sleep(nextTry);
         }