diff --git a/Directory.Build.props b/Directory.Build.props index 25a48291..2b63653b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -4,7 +4,7 @@ - 1.0.17 + 1.0.18 diff --git a/GitHubReleaseNotes.txt b/GitHubReleaseNotes.txt index c48b3317..860f0b5a 100644 --- a/GitHubReleaseNotes.txt +++ b/GitHubReleaseNotes.txt @@ -1,3 +1,3 @@ https://github.com/StefH/GitHubReleaseNotes -GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.17.0 \ No newline at end of file +GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.18.0 \ No newline at end of file diff --git a/examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json b/examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json index 72fecc44..31af6a1d 100644 --- a/examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json +++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "WireMock.Net.StandAlone.NETCoreApp": { "commandName": "Project", - "commandLineArgs": "--Urls http://*:9091" + "commandLineArgs": "--Urls http://*:9091 --WireMockLogger WireMockConsoleLogger" } } } \ No newline at end of file diff --git a/src/WireMock.Net.StandAlone/StandAloneApp.cs b/src/WireMock.Net.StandAlone/StandAloneApp.cs index 916fb74b..17105b75 100644 --- a/src/WireMock.Net.StandAlone/StandAloneApp.cs +++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs @@ -50,7 +50,7 @@ namespace WireMock.Net.StandAlone AdminUsername = parser.GetStringValue("AdminUsername"), AdminPassword = parser.GetStringValue("AdminPassword"), MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"), - RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"), + RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration") }; if (logger != null) @@ -58,6 +58,11 @@ namespace WireMock.Net.StandAlone settings.Logger = logger; } + if (parser.GetStringValue("WireMockLogger") == "WireMockConsoleLogger") + { + settings.Logger = new WireMockConsoleLogger(); + } + if (parser.Contains("Port")) { settings.Port = parser.GetIntValue("Port"); @@ -82,9 +87,7 @@ namespace WireMock.Net.StandAlone settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'"))); - FluentMockServer server = Start(settings); - - return server; + return Start(settings); } } } \ No newline at end of file diff --git a/src/WireMock.Net/Server/FluentMockServer.cs b/src/WireMock.Net/Server/FluentMockServer.cs index 81bc5b2e..6ac06198 100644 --- a/src/WireMock.Net/Server/FluentMockServer.cs +++ b/src/WireMock.Net/Server/FluentMockServer.cs @@ -1,11 +1,11 @@ using JetBrains.Annotations; +using Newtonsoft.Json; using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading; -using Newtonsoft.Json; using WireMock.Exceptions; using WireMock.Handlers; using WireMock.Logging; @@ -185,7 +185,7 @@ namespace WireMock.Server private FluentMockServer(IFluentMockServerSettings settings) { - settings.Logger = settings.Logger ?? new WireMockConsoleLogger(); + settings.Logger = settings.Logger ?? new WireMockNullLogger(); _logger = settings.Logger; _fileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler(); diff --git a/src/WireMock.Net/Settings/FluentMockServerSettings.cs b/src/WireMock.Net/Settings/FluentMockServerSettings.cs index c773ff9d..9859ae58 100644 --- a/src/WireMock.Net/Settings/FluentMockServerSettings.cs +++ b/src/WireMock.Net/Settings/FluentMockServerSettings.cs @@ -1,6 +1,6 @@ -using System; -using JetBrains.Annotations; +using JetBrains.Annotations; using Newtonsoft.Json; +using System; using WireMock.Handlers; using WireMock.Logging; diff --git a/src/WireMock.Net/Settings/IFluentMockServerSettings.cs b/src/WireMock.Net/Settings/IFluentMockServerSettings.cs index 373eda26..e21c475b 100644 --- a/src/WireMock.Net/Settings/IFluentMockServerSettings.cs +++ b/src/WireMock.Net/Settings/IFluentMockServerSettings.cs @@ -24,7 +24,7 @@ namespace WireMock.Settings bool? UseSSL { get; set; } /// - /// Gets or sets wether to start admin interface. + /// Gets or sets whether to start admin interface. /// [PublicAPI] bool? StartAdminInterface { get; set; }