FIx for IsStarted (#93)

This commit is contained in:
Stef Heyenrath
2018-02-28 08:34:57 +01:00
parent 938d3fb095
commit 17741cbc50
3 changed files with 6 additions and 6 deletions

View File

@@ -37,7 +37,7 @@ namespace WireMock.Net.StandAlone.NETCoreApp
while (true) while (true)
{ {
Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running"); Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running : {_server.IsStarted}");
Thread.Sleep(sleepTime); Thread.Sleep(sleepTime);
} }
} }

View File

@@ -87,20 +87,20 @@ namespace WireMock.Owin
#endif #endif
.Build(); .Build();
IsStarted = true;
#if NETSTANDARD1_3 #if NETSTANDARD1_3
Console.WriteLine("WireMock.Net server using netstandard1.3"); Console.WriteLine("WireMock.Net server using netstandard1.3");
return Task.Run(() => return Task.Run(() =>
{ {
_host.Run(_cts.Token); _host.Run(_cts.Token);
IsStarted = true;
}, _cts.Token); }, _cts.Token);
#else #else
System.Console.WriteLine("WireMock.Net server using netstandard2.0"); System.Console.WriteLine("WireMock.Net server using netstandard2.0");
IsStarted = true;
return Task.Run(() => return Task.Run(() =>
{ {
_host.Run(); _host.Run();
IsStarted = true;
}, _cts.Token); }, _cts.Token);
#endif #endif
} }

View File

@@ -181,8 +181,6 @@ namespace WireMock.Server
#else #else
_httpServer = new OwinSelfHost(_options, Urls); _httpServer = new OwinSelfHost(_options, Urls);
#endif #endif
IsStarted = _httpServer.IsStarted;
Ports = _httpServer.Ports; Ports = _httpServer.Ports;
_httpServer.StartAsync(); _httpServer.StartAsync();
@@ -190,6 +188,8 @@ namespace WireMock.Server
// Fix for 'Bug: Server not listening after Start() returns (on macOS)' // Fix for 'Bug: Server not listening after Start() returns (on macOS)'
Task.Delay(ServerStartDelay).Wait(); Task.Delay(ServerStartDelay).Wait();
IsStarted = _httpServer.IsStarted;
if (settings.AllowPartialMapping == true) if (settings.AllowPartialMapping == true)
{ {
AllowPartialMapping(); AllowPartialMapping();