Use same Cancel script to unload AppDomain

ServiceStack · Jun 28, 2017 · 5bf3019 · 5bf3019
1 parent 735ea9f
commit 5bf3019
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/Gistlyn.ServiceInterface/RunScriptService.cs b/src/Gistlyn.ServiceInterface/RunScriptService.cs
@@ -41,14 +41,15 @@ public object Any(RunScript request)
             var existingUserScripts = GetExistingActiveUserScripts();
 
             var runnerInfo = LocalCache.GetScriptRunnerInfo(request.ScriptId);
+
             //stop script if run
-            if (runnerInfo != null && runnerInfo.ScriptDomain != null)
+            if (runnerInfo?.ScriptDomain != null)
             {
                 var scriptStatus = runnerInfo.DomainWrapper.GetScriptStatus();
 
-                if (request.ForceRun || (scriptStatus != ScriptStatus.PrepareToRun && scriptStatus != ScriptStatus.Running))
+                if (request.ForceRun || scriptStatus != ScriptStatus.PrepareToRun && scriptStatus != ScriptStatus.Running)
                 {
-                    AppDomain.Unload(runnerInfo.ScriptDomain);
+                    Cancel(runnerInfo);
                 }
                 else
                 {
@@ -107,7 +108,7 @@ public object Any(GetScriptVariables request)
         {
             var runner = LocalCache.GetScriptRunnerInfo(request.ScriptId);
 
-            var wrapper = runner != null ? runner.DomainWrapper : null;
+            var wrapper = runner?.DomainWrapper;
 
             var variables = wrapper != null
                 ? wrapper.GetVariables(request.VariableName)
@@ -153,16 +154,17 @@ public object Any(CancelScript request)
         private DomainWrapper GetDomainWrapper(EvaluateExpression request)
         {
             var runner = LocalCache.GetScriptRunnerInfo(request.ScriptId);
-            var wrapper = runner != null ? runner.DomainWrapper : null;
+            var wrapper = runner?.DomainWrapper;
             if (wrapper == null)
                 throw HttpError.NotFound("Script no longer exists on server");
             return wrapper;
         }
 
         private bool Cancel(ScriptRunnerInfo runner)
         {
-            if (runner != null && runner.ScriptDomain != null)
+            if (runner?.ScriptDomain != null)
             {
+                runner.DomainWrapper.Cancel();
                 var domain = runner.ScriptDomain;
                 runner.ScriptDomain = null;
                 LocalCache.RemoveScriptRunnerInfo(runner.ScriptId);