From 768037b659951e9eba2abc7c91c848c6dc136b63 Mon Sep 17 00:00:00 2001
From: Renaud Paquay <rpaquay@microsoft.com>
Date: Sat, 24 Jul 2010 15:03:13 -0700
Subject: [PATCH] Tweaking notification messages

--HG--
branch : dev
---
 src/Orchard/Commands/CommandHostAgent.cs           |  6 ++----
 src/Orchard/Commands/CommandHostEnvironment.cs     |  2 +-
 src/Tools/OrchardCli/CLIHost.cs                    | 10 +++++-----
 src/Tools/OrchardCli/CommandHostContext.cs         |  1 +
 src/Tools/OrchardCli/CommandHostContextProvider.cs |  1 +
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Orchard/Commands/CommandHostAgent.cs b/src/Orchard/Commands/CommandHostAgent.cs
index 73eae350a..779713e1e 100644
--- a/src/Orchard/Commands/CommandHostAgent.cs
+++ b/src/Orchard/Commands/CommandHostAgent.cs
@@ -59,8 +59,7 @@ namespace Orchard.Commands {
             }
             catch (OrchardCommandHostRetryException e) {
                 // Special "Retry" return code for our host
-                output.WriteLine("{0}", e.Message);
-                output.WriteLine("(Retrying...)");
+                output.WriteLine("{0} (Retrying...)", e.Message);
                 return 240;
             }
             catch (Exception e) {
@@ -82,8 +81,7 @@ namespace Orchard.Commands {
             }
             catch (OrchardCommandHostRetryException e) {
                 // Special "Retry" return code for our host
-                output.WriteLine("{0}", e.Message);
-                output.WriteLine("(Retrying...)");
+                output.WriteLine("{0} (Retrying...)", e.Message);
                 return 240;
             }
             catch (Exception e) {
diff --git a/src/Orchard/Commands/CommandHostEnvironment.cs b/src/Orchard/Commands/CommandHostEnvironment.cs
index 8b42245e7..ac085b3cd 100644
--- a/src/Orchard/Commands/CommandHostEnvironment.cs
+++ b/src/Orchard/Commands/CommandHostEnvironment.cs
@@ -44,7 +44,7 @@ namespace Orchard.Commands {
         }
 
         public void ResetSiteCompilation() {
-            throw new OrchardCommandHostRetryException(T("A change of configuration requires the host to be restarted."));
+            throw new OrchardCommandHostRetryException(T("A change of configuration requires the session to be restarted."));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Tools/OrchardCli/CLIHost.cs b/src/Tools/OrchardCli/CLIHost.cs
index b148948fe..b409d0d6a 100644
--- a/src/Tools/OrchardCli/CLIHost.cs
+++ b/src/Tools/OrchardCli/CLIHost.cs
@@ -42,9 +42,9 @@ namespace OrchardCLI {
         }
 
         private CommandHostContext CommandHostContext() {
-            _output.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"*/) {
+            if (result.StartSessionResult == result.RetryResult) {
                 result = _commandHostContextProvider.CreateContext();
             }
             return result;
@@ -55,7 +55,7 @@ namespace OrchardCLI {
                 return context;
 
             int result = RunCommandInSession(context, command);
-            if (result == 240/*special return code for "Retry"*/) {
+            if (result == context.RetryResult) {
                 _commandHostContextProvider.Shutdown(context);
                 context = CommandHostContext();
                 result = RunCommandInSession(context, command);
@@ -71,8 +71,8 @@ namespace OrchardCLI {
                 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"*/
+                _output.WriteLine("AppDomain of Orchard session has been unloaded. (Retrying...)");
+                return context.RetryResult;
             }
         }
     }
diff --git a/src/Tools/OrchardCli/CommandHostContext.cs b/src/Tools/OrchardCli/CommandHostContext.cs
index d3cf36e84..933942159 100644
--- a/src/Tools/OrchardCli/CommandHostContext.cs
+++ b/src/Tools/OrchardCli/CommandHostContext.cs
@@ -7,6 +7,7 @@ using Orchard.Host;
 namespace OrchardCLI {
     public class CommandHostContext {
         public int StartSessionResult { get; set; }
+        public int RetryResult { get; set; }
         public OrchardParameters Arguments { get; set; }
         public DirectoryInfo OrchardDirectory { get; set; }
         public ApplicationManager AppManager { get; set; }
diff --git a/src/Tools/OrchardCli/CommandHostContextProvider.cs b/src/Tools/OrchardCli/CommandHostContextProvider.cs
index d883221a3..984538f57 100644
--- a/src/Tools/OrchardCli/CommandHostContextProvider.cs
+++ b/src/Tools/OrchardCli/CommandHostContextProvider.cs
@@ -22,6 +22,7 @@ namespace OrchardCLI {
 
         public CommandHostContext CreateContext() {
             var context = new CommandHostContext();
+            context.RetryResult = 240;/*special return code for "Retry"*/
             Initialize(context);
             return context;
         }