starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-04-23 09:18:55 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Fix code for .NET Core 2 so that server has cancellation token, and Stop method waits for shutdown. This resolves issues when using .NET Core 2 and starting/stopping server instances. (#145)

Browse Source
This commit is contained in:
Bob Paul
2018-05-28 02:30:18 -04:00
committed by Stef Heyenrath
parent 0640c88bcd
commit 297743a19a
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
View File

@@ -110,7 +110,7 @@ namespace WireMock.Owin
_host.Run(_cts.Token); _host.Run(_cts.Token);
#else #else
_logger.Info("WireMock.Net server using netstandard2.0"); _logger.Info("WireMock.Net server using netstandard2.0");
_host.Run(); _host.RunAsync(_cts.Token).Wait();
#endif #endif
} }
catch (Exception e) catch (Exception e)

4
src/WireMock.Net/Server/FluentMockServer.cs
View File

@@ -248,7 +248,9 @@ namespace WireMock.Server
[PublicAPI] [PublicAPI]
public void Stop() public void Stop()
{ {
_httpServer?.StopAsync(); var result = _httpServer?.StopAsync();
if (result != null)
result.Wait(); //wait for stop to actually happen
} }
#endregion #endregion