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

Add start delay from 100ms to fix startup issue on MacOS (#44)

Browse Source
This commit is contained in:
Stef Heyenrath
2017-09-30 10:03:00 +02:00
parent 881e4b2af3
commit 8827531391
6 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JetBrains.Annotations;
using WireMock.Http;
using WireMock.Matchers;
@@ -20,6 +21,7 @@ namespace WireMock.Server
/// </summary>
public partial class FluentMockServer : IDisposable
{
private const int ServerStartDelay = 100;
private readonly IOwinSelfHost _httpServer;
private readonly object _syncRoot = new object();
private readonly WireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
@@ -173,6 +175,9 @@ namespace WireMock.Server
_httpServer.StartAsync();
// Fix for 'Bug: Server not listening after Start() returns (on macOS)'
Task.Delay(ServerStartDelay).Wait();
if (settings.AllowPartialMapping == true)
{
AllowPartialMapping();
@@ -318,7 +323,10 @@ namespace WireMock.Server
Check.NotNull(password, nameof(password));
string authorization = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password));
_options.AuthorizationMatcher = new RegexMatcher("^(?i)BASIC " + authorization + "$");
lock (_syncRoot)
{
_options.AuthorizationMatcher = new RegexMatcher("^(?i)BASIC " + authorization + "$");
}
}
/// <summary>
@@ -327,7 +335,10 @@ namespace WireMock.Server
[PublicAPI]
public void RemoveBasicAuthentication()
{
_options.AuthorizationMatcher = null;
lock (_syncRoot)
{
_options.AuthorizationMatcher = null;
}
}
/// <summary>
@@ -337,7 +348,10 @@ namespace WireMock.Server
[PublicAPI]
public void SetMaxRequestLogCount([CanBeNull] int? maxRequestLogCount)
{
_options.MaxRequestLogCount = maxRequestLogCount;
lock (_syncRoot)
{
_options.MaxRequestLogCount = maxRequestLogCount;
}
}
/// <summary>
@@ -347,7 +361,10 @@ namespace WireMock.Server
[PublicAPI]
public void SetRequestLogExpirationDuration([CanBeNull] int? requestLogExpirationDuration)
{
_options.RequestLogExpirationDuration = requestLogExpirationDuration;
lock (_syncRoot)
{
_options.RequestLogExpirationDuration = requestLogExpirationDuration;
}
}
/// <summary>