Fix RedisPubSubServer blocks running thread

xplicit · xplicit · commit aef445a0e9c0 · 2016-10-28T23:13:14.000+07:00
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"
          }
      }
    

Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,7 @@ public class RedisPubSubServer : IRedisPubSubServer`
`41`	`41`	`private int noOfContinuousErrors = 0;`
`42`	`42`	`private string lastExMsg = null;`
`43`	`43`	`private int status;`
`44`		`-#if !NETSTANDARD1_3`
`45`	`44`	`private Thread bgThread; //Subscription controller thread`
`46`		`-#endif`
`47`	`45`	`private long bgThreadCount = 0;`
`48`	`46`
`49`	`47`	`private const int NO = 0;`
`@@ -111,9 +109,6 @@ public IRedisPubSubServer Start()`
`111`	`109`	`if (OnStart != null)`
`112`	`110`	`OnStart();`
`113`	`111`
`114`		`-#if NETSTANDARD1_3`
`115`		`- RunLoop();`
`116`		`-#else`
`117`	`112`	`//Don't kill us if we're the thread that's retrying to Start() after a failure.`
`118`	`113`	`if (bgThread != Thread.CurrentThread)`
`119`	`114`	`{`
`@@ -134,7 +129,6 @@ public IRedisPubSubServer Start()`
`134`	`129`	`Log.Debug("Retrying RunLoop() on Thread: " + bgThread.Name);`
`135`	`130`	`RunLoop();`
`136`	`131`	`}`
`137`		`-#endif`
`138`	`132`	`}`
`139`	`133`	`catch (Exception ex)`
`140`	`134`	`{`
`@@ -438,14 +432,14 @@ public void Restart()`
`438`	`432`	`Stop(shouldRestart:true);`
`439`	`433`	`}`
`440`	`434`
`441`		`-#if !NETSTANDARD1_3`
`442`	`435`	`private void KillBgThreadIfExists()`
`443`	`436`	`{`
`444`	`437`	`if (bgThread != null && bgThread.IsAlive)`
`445`	`438`	`{`
`446`	`439`	`//give it a small chance to die gracefully`
`447`	`440`	`if (!bgThread.Join(500))`
`448`	`441`	`{`
	`442`	`+#if !NETSTANDARD1_3`
`449`	`443`	`//Ideally we shouldn't get here, but lets try our hardest to clean it up`
`450`	`444`	`Log.Warn("Interrupting previous Background Thread: " + bgThread.Name);`
`451`	`445`	`bgThread.Interrupt();`
`@@ -454,11 +448,11 @@ private void KillBgThreadIfExists()`
`454`	`448`	`Log.Warn(bgThread.Name + " just wont die, so we're now aborting it...");`
`455`	`449`	`bgThread.Abort();`
`456`	`450`	`}`
	`451`	`+#endif`
`457`	`452`	`}`
`458`	`453`	`bgThread = null;`
`459`	`454`	`}`
`460`	`455`	`}`
`461`		`-#endif`
`462`	`456`
`463`	`457`	`private void SleepBackOffMultiplier(int continuousErrorsCount)`
`464`	`458`	`{`
`@@ -567,7 +561,6 @@ public virtual void Dispose()`
`567`	`561`	`Log.Error("Error OnDispose(): ", ex);`
`568`	`562`	`}`
`569`	`563`
`570`		`-#if !NETSTANDARD1_3`
`571`	`564`	`try`
`572`	`565`	`{`
`573`	`566`	`Thread.Sleep(100); //give it a small chance to die gracefully`
`@@ -577,7 +570,6 @@ public virtual void Dispose()`
`577`	`570`	`{`
`578`	`571`	`if (this.OnError != null) this.OnError(ex);`
`579`	`572`	`}`
`580`		`-#endif`
`581`	`573`
`582`	`574`	`DisposeHeartbeatTimer();`
`583`	`575`	`}`