Changeset 737

Timestamp:

12/6/2008 3:29:53 AM (4 years ago)

Author:

lowjoel

Message:

-Allow the --method parameter to be optional
-If a RemoteExecutorServer? instance is not running, Program should detect it and start a new Eraser instance.

Location:

branches/eraser6

Files:

• Eraser/Program.cs (modified) (3 diffs)
• Manager/RemoteExecutor.cs (modified) (1 diff)

branches/eraser6/Eraser/Program.cs

@@ -31 +31 @@
 using System.Globalization;
 using System.Reflection;
+using System.Diagnostics;
 
 namespace Eraser
@@ -82 +83 @@
                 using (Program.eraserClient = new RemoteExecutorClient())
                 {
+                    if (!((RemoteExecutorClient)Program.eraserClient).Connect())
+                    {
+                        //The client cannot connect to the server. This probably means
+                        //that the server process isn't running. Start an instance.
+                        Process eraserInstance = Process.Start(
+                            Assembly.GetExecutingAssembly().Location);
+                        eraserInstance.WaitForInputIdle();
+                    }
+
                     eraserClient.Run();
                     program.Run();
@@ -629 +639 @@
         private void AddTask()
         {
-            //Check that all our command line parameters are present.
             AddTaskCommandLine arguments = (AddTaskCommandLine)Arguments;
-            if (arguments.ErasureMethod == Guid.Empty)
-                throw new ArgumentException("The --method parameter was not specified.");
-
+            
             //Create the task, and set the method to use.
             Task task = new Task();
-            ErasureMethod method = ErasureMethodManager.GetInstance(arguments.ErasureMethod);
+            ErasureMethod method = arguments.ErasureMethod == Guid.Empty ? 
+                ErasureMethodManager.Default :
+                ErasureMethodManager.GetInstance(arguments.ErasureMethod);
             foreach (Task.ErasureTarget target in arguments.Targets)
             {

branches/eraser6/Manager/RemoteExecutor.cs

@@ -306 +306 @@
         }
 
+        /// <summary>
+        /// Connects to the remote server.
+        /// </summary>
+        /// <returns>True if the connection to the remote server was established.</returns>
+        public bool Connect()
+        {
+            try
+            {
+                client.Connect(250);
+            }
+            catch (TimeoutException)
+            {
+            }
+
+            return client.IsConnected;
+        }
+
         private object SendRequest(RemoteRequest header)
         {