Fix RedisPubSubServer blocks running thread

ServiceStack · Oct 28, 2016 · aef445a · aef445a
1 parent 4dd6364
commit aef445a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/ServiceStack.Redis/RedisPubSubServer.cs b/src/ServiceStack.Redis/RedisPubSubServer.cs
@@ -41,9 +41,7 @@ public class RedisPubSubServer : IRedisPubSubServer
         private int noOfContinuousErrors = 0;
         private string lastExMsg = null;
         private int status;
-#if !NETSTANDARD1_3
         private Thread bgThread; //Subscription controller thread
-#endif
         private long bgThreadCount = 0;
 
         private const int NO = 0;
@@ -111,9 +109,6 @@ public IRedisPubSubServer Start()
                     if (OnStart != null)
                         OnStart();
 
-#if NETSTANDARD1_3
-                    RunLoop();
-#else
                     //Don't kill us if we're the thread that's retrying to Start() after a failure.
                     if (bgThread != Thread.CurrentThread)
                     {
@@ -134,7 +129,6 @@ public IRedisPubSubServer Start()
                             Log.Debug("Retrying RunLoop() on Thread: " + bgThread.Name);
                         RunLoop();
                     }
-#endif
                 }
                 catch (Exception ex)
                 {
@@ -438,14 +432,14 @@ public void Restart()
             Stop(shouldRestart:true);
         }
 
-#if !NETSTANDARD1_3
         private void KillBgThreadIfExists()
         {
             if (bgThread != null && bgThread.IsAlive)
             {
                 //give it a small chance to die gracefully
                 if (!bgThread.Join(500))
                 {
+#if !NETSTANDARD1_3                    
                     //Ideally we shouldn't get here, but lets try our hardest to clean it up
                     Log.Warn("Interrupting previous Background Thread: " + bgThread.Name);
                     bgThread.Interrupt();
@@ -454,11 +448,11 @@ private void KillBgThreadIfExists()
                         Log.Warn(bgThread.Name + " just wont die, so we're now aborting it...");
                         bgThread.Abort();
                     }
+#endif
                 }
                 bgThread = null;
             }
         }
-#endif
 
         private void SleepBackOffMultiplier(int continuousErrorsCount)
         {
@@ -567,7 +561,6 @@ public virtual void Dispose()
                 Log.Error("Error OnDispose(): ", ex);
             }
 
-#if !NETSTANDARD1_3
             try
             {
                 Thread.Sleep(100); //give it a small chance to die gracefully
@@ -577,7 +570,6 @@ public virtual void Dispose()
             {
                 if (this.OnError != null) this.OnError(ex);
             }
-#endif
 
             DisposeHeartbeatTimer();
         }

diff --git a/src/ServiceStack.Redis/project.json b/src/ServiceStack.Redis/project.json
@@ -18,15 +18,15 @@
     "ServiceStack.Text" : "1.0.*",
     "ServiceStack.Common" : "1.0.*"
   },
-  "exclude": ["RedisPipeline.cs"],
   "frameworks": {
     "netstandard1.3": {
         "dependencies" : {
             "System.Net.Security" : "4.0.0",
             "System.Collections.Specialized": "4.0.1",
             "System.Collections.NonGeneric": "4.0.1",
-            "System.Net.NameResolution" : "4.0.0",
-            "System.Data.Common" : "4.1.0"
+            "System.Net.NameResolution": "4.0.0",
+            "System.Data.Common": "4.1.0",
+            "System.Threading.Thread": "4.0.0"
          }
      }