Merge pull request #274 from brad-jones/master

Fixes #272
OmniSharp · Jul 22, 2015 · 6f4a617 · 6f4a617
2 parents 73b47c5 + 3bf3018
commit 6f4a617
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/OmniSharp/Dnx/DesignTimeHostManager.cs b/src/OmniSharp/Dnx/DesignTimeHostManager.cs
@@ -63,7 +63,7 @@ public void Start(string hostId, Action<int> onConnected)
                 using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp))
                 {
                     var t1 = DateTime.UtcNow;
-                    var dthTimeout = TimeSpan.FromSeconds(4);
+                    var dthTimeout = TimeSpan.FromSeconds(10);
                     while (!socket.Connected && DateTime.UtcNow - t1 < dthTimeout)
                     {
                         Thread.Sleep(500);
@@ -76,6 +76,13 @@ public void Start(string hostId, Action<int> onConnected)
                             // this happens when the DTH isn't listening yet
                         }
                     }
+
+                    if (!socket.Connected)
+                    {
+                        // reached timeout
+                        _logger.LogError("Failed to launch DesignTimeHost in a timely fashion.");
+                        return;
+                    }
                 }
 
                 if (_designTimeHostProcess.HasExited)
@@ -98,7 +105,7 @@ public void Start(string hostId, Action<int> onConnected)
                 onConnected(port);
             }
         }
-        
+
         public void Stop()
         {
             lock (_processLock)