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

Update logging (add version)

Browse Source
This commit is contained in:
Stef Heyenrath
2021-10-24 10:44:39 +02:00
parent 74edad517b
commit 7ca2095576
6 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/WireMock.Net.StandAlone/StandAloneApp.cs
View File

@@ -1,4 +1,5 @@
using System.Linq; using System.Linq;
using System.Reflection;
using JetBrains.Annotations; using JetBrains.Annotations;
using WireMock.Logging; using WireMock.Logging;
using WireMock.Server; using WireMock.Server;
@@ -12,6 +13,8 @@ namespace WireMock.Net.StandAlone
/// </summary> /// </summary>
public static class StandAloneApp public static class StandAloneApp
{ {
private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version.ToString();
/// <summary> /// <summary>
/// Start WireMock.Net standalone Server based on the IWireMockServerSettings. /// Start WireMock.Net standalone Server based on the IWireMockServerSettings.
/// </summary> /// </summary>
@@ -23,7 +26,8 @@ namespace WireMock.Net.StandAlone
var server = WireMockServer.Start(settings); var server = WireMockServer.Start(settings);
settings.Logger?.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls)); settings.Logger?.Info("Version [{0}]", Version);
settings.Logger?.Info("Server listening at {0}", string.Join(",", server.Urls));
return server; return server;
} }
@@ -40,7 +44,8 @@ namespace WireMock.Net.StandAlone
if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger)) if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger))
{ {
settings.Logger?.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'"))); settings.Logger?.Info("Version [{0}]", Version);
settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
return Start(settings); return Start(settings);
} }
@@ -61,7 +66,8 @@ namespace WireMock.Net.StandAlone
if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger)) if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger))
{ {
settings.Logger?.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'"))); settings.Logger?.Info("Version [{0}]", Version);
settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
server = Start(settings); server = Start(settings);
return true; return true;

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

@@ -1,4 +1,4 @@
#if USE_ASPNETCORE #if USE_ASPNETCORE
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@@ -118,17 +118,17 @@ namespace WireMock.Owin
}); });
#if NETSTANDARD1_3 #if NETSTANDARD1_3
_logger.Info("WireMock.Net server using netstandard1.3"); _logger.Info("Server using netstandard1.3");
#elif NETSTANDARD2_0 #elif NETSTANDARD2_0
_logger.Info("WireMock.Net server using netstandard2.0"); _logger.Info("Server using netstandard2.0");
#elif NETSTANDARD2_1 #elif NETSTANDARD2_1
_logger.Info("WireMock.Net server using netstandard2.1"); _logger.Info("Server using netstandard2.1");
#elif NETCOREAPP3_1 #elif NETCOREAPP3_1
_logger.Info("WireMock.Net server using .NET Core 3.1"); _logger.Info("Server using .NET Core 3.1");
#elif NET5_0 #elif NET5_0
_logger.Info("WireMock.Net server using .NET 5.0"); _logger.Info("Server using .NET 5.0");
#elif NET46 #elif NET46
_logger.Info("WireMock.Net server using .NET Framework 4.6.1 or higher"); _logger.Info("Server using .NET Framework 4.6.1 or higher");
#endif #endif
#if NETSTANDARD1_3 #if NETSTANDARD1_3

6
src/WireMock.Net/Owin/OwinSelfHost.cs
View File

@@ -1,4 +1,4 @@
#if !USE_ASPNETCORE #if !USE_ASPNETCORE
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.Owin.Hosting; using Microsoft.Owin.Hosting;
using Owin; using Owin;
@@ -63,9 +63,9 @@ namespace WireMock.Owin
private void StartServers() private void StartServers()
{ {
#if NET46 #if NET46
_logger.Info("WireMock.Net server using .net 4.6.1 or higher"); _logger.Info("Server using .net 4.6.1 or higher");
#else #else
_logger.Info("WireMock.Net server using .net 4.5.x"); _logger.Info("Server using .net 4.5.x");
#endif #endif
var servers = new List<IDisposable>(); var servers = new List<IDisposable>();

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

@@ -202,8 +202,8 @@ namespace WireMock.Server
_settings.Logger = settings.Logger ?? new WireMockNullLogger(); _settings.Logger = settings.Logger ?? new WireMockNullLogger();
_settings.FileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler(); _settings.FileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler();
_settings.Logger.Info("WireMock.Net by Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)"); _settings.Logger.Info("By Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)");
_settings.Logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented)); _settings.Logger.Debug("Server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
HostUrlOptions urlOptions; HostUrlOptions urlOptions;
if (settings.Urls != null) if (settings.Urls != null)

10
src/dotnet-WireMock.Net/Program.cs
View File

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging;
using WireMock.Net.StandAlone; using WireMock.Net.StandAlone;
using WireMock.Server; using WireMock.Server;
namespace WireMock namespace WireMock.Net
{ {
public class Program public class Program
{ {
@@ -18,7 +18,7 @@ namespace WireMock
options.SingleLine = false; options.SingleLine = false;
options.TimestampFormat = "yyyy-MM-ddTHH:mm:ss "; options.TimestampFormat = "yyyy-MM-ddTHH:mm:ss ";
}); });
}).CreateLogger(string.Empty); }).CreateLogger("WireMock.Net");
private static WireMockServer Server; private static WireMockServer Server;
@@ -43,16 +43,16 @@ namespace WireMock
while (true) while (true)
{ {
Logger.LogInformation("WireMock.Net server running : {IsStarted}", Server.IsStarted); Logger.LogInformation("Server running : {IsStarted}", Server.IsStarted);
await Task.Delay(SleepTime); await Task.Delay(SleepTime);
} }
} }
private static void Stop(string why) private static void Stop(string why)
{ {
Logger.LogInformation("WireMock.Net server stopping because '{why}'", why); Logger.LogInformation("Server stopping because '{why}'", why);
Server.Stop(); Server.Stop();
Logger.LogInformation("WireMock.Net server stopped"); Logger.LogInformation("Server stopped");
} }
} }
} }

4
src/dotnet-WireMock.Net/WireMockLogger.cs
View File

@@ -1,10 +1,10 @@
using System; using System;
using System.Text.Json; using System.Text.Json;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using WireMock.Admin.Requests; using WireMock.Admin.Requests;
using WireMock.Logging; using WireMock.Logging;
namespace WireMock namespace WireMock.Net
{ {
public class WireMockLogger : IWireMockLogger public class WireMockLogger : IWireMockLogger
{ {