Changeset 2238

Timestamp:

8/4/2010 10:39:59 AM (3 years ago)

Author:

lowjoel

Message:

Be slightly more intelligent when connecting to a remote instance: connection via pipes should be instantaneous so have a timeout of 0. If we can't connect, Run will return immediately so that we won't have to keep waiting for Run to return and then we can initiate the new instance of Eraser.

Location:

trunk/eraser

Files:

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

trunk/eraser/Eraser.Manager/RemoteExecutor.cs

@@ -336 +336 @@
             try
             {
-                client.Connect(10000);
+                client.Connect(0);
             }
             catch (TimeoutException)

trunk/eraser/Eraser/Program.cs

@@ -284 +284 @@
                     eraserInstance.WaitForInputIdle();
 
-                    result.Run();
-                    if (!result.IsConnected)
-                        throw new IOException(S._("Eraser cannot connect to the running " +
-                            "instance for erasures."));
+                    //Wait for the server to be initialised.
+                    for (int i = 0; !result.IsConnected; ++i)
+                    {
+                        Thread.Sleep(100);
+                        result.Run();
+
+                        //After 10s, we should probably give up.
+                        if (i > 100)
+                            throw new IOException(S._("Eraser cannot connect to the running " +
+                                "instance for erasures."));
+                    }
                 }