From 677cfd3c6fd08cc2c502bec5f2148dd62ec97074 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Sat, 24 Jul 2010 14:48:48 -0700
Subject: [PATCH] Implement retry logic when AppDomain has been unloaded

--HG--
branch : dev
---
 src/Tools/OrchardCli/CLIHost.cs | 40 ++++++++++++++++++---------------
 src/Tools/OrchardCli/Program.cs |  4 +++-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/Tools/OrchardCli/CLIHost.cs b/src/Tools/OrchardCli/CLIHost.cs
index d605bc890..b148948fe 100644
--- a/src/Tools/OrchardCli/CLIHost.cs
+++ b/src/Tools/OrchardCli/CLIHost.cs
@@ -10,15 +10,15 @@ namespace OrchardCLI {
         private readonly TextReader _input;
         private readonly ICommandHostContextProvider _commandHostContextProvider;
 
-        public CLIHost(string[] args) {
-            _input = Console.In;
-            _output = Console.Out;
+        public CLIHost(TextReader input, TextWriter output, string[] args) {
+            _input = input;
+            _output = output;
             _commandHostContextProvider = new CommandHostContextProvider(args);
         }
 
         public int Run() {
             var context = CommandHostContext();
-            Console.WriteLine("Type \"help commands\" for help, \"exit\" to exit");
+            _output.WriteLine("Type \"help commands\" for help, \"exit\" to exit");
             while (true) {
                 var command = ReadCommand(context);
                 switch (command.ToLowerInvariant()) {
@@ -36,13 +36,13 @@ namespace OrchardCLI {
         }
 
         private string ReadCommand(CommandHostContext context) {
-            Console.WriteLine();
-            Console.Write("orchard> ");
-            return Console.ReadLine();
+            _output.WriteLine();
+            _output.Write("orchard> ");
+            return _input.ReadLine();
         }
 
         private CommandHostContext CommandHostContext() {
-            Console.WriteLine("Initializing Orchard session... (This might take a few seconds)");
+            _output.WriteLine("Initializing Orchard session... (This might take a few seconds)");
             var result = _commandHostContextProvider.CreateContext();
             if (result.StartSessionResult == 240/*special return code for "Retry"*/) {
                 result = _commandHostContextProvider.CreateContext();
@@ -55,21 +55,25 @@ namespace OrchardCLI {
                 return context;
 
             int result = RunCommandInSession(context, command);
-            if(result == 240) {
-                if (result == 240/*special return code for "Retry"*/) {
-                    _commandHostContextProvider.Shutdown(context);
-                    context = CommandHostContext();
-                    result = RunCommandInSession(context, command);
-                    if (result != 0)
-                        Console.WriteLine("Command returned non-zero result: {0}", result);
-                }
+            if (result == 240/*special return code for "Retry"*/) {
+                _commandHostContextProvider.Shutdown(context);
+                context = CommandHostContext();
+                result = RunCommandInSession(context, command);
+                if (result != 0)
+                    _output.WriteLine("Command returned non-zero result: {0}", result);
             }
             return context;
         }
 
         private int RunCommandInSession(CommandHostContext context, string command) {
-            var args = new OrchardParametersParser().Parse(new CommandParametersParser().Parse(ResponseFileReader.SplitArgs(command)));
-            return context.CommandHost.RunCommandInSession(_input, _output, context.Logger, args);
+            try {
+                var args = new OrchardParametersParser().Parse(new CommandParametersParser().Parse(ResponseFileReader.SplitArgs(command)));
+                return context.CommandHost.RunCommandInSession(_input, _output, context.Logger, args);
+            }
+            catch (AppDomainUnloadedException) {
+                _output.WriteLine("AppDomain of Orchard session has been unloaded. Retrying...");
+                return 240;/*special return code for "Retry"*/
+            }
         }
     }
 }
diff --git a/src/Tools/OrchardCli/Program.cs b/src/Tools/OrchardCli/Program.cs
index 4f4eb0588..6a88b1eea 100644
--- a/src/Tools/OrchardCli/Program.cs
+++ b/src/Tools/OrchardCli/Program.cs
@@ -1,7 +1,9 @@
+using System;
+
 namespace OrchardCLI {
     public class Program {
         public static int Main(string[] args) {
-            return new CLIHost(args).Run();
+            return new CLIHost(Console.In, Console.Out, args).Run();
         }
     }
 }