From 7ca20955765e3b7eac8499a3f47120aa36b7a710 Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Sun, 24 Oct 2021 10:44:39 +0200 Subject: [PATCH] Update logging (add version) --- src/WireMock.Net.StandAlone/StandAloneApp.cs | 14 ++++++++++---- src/WireMock.Net/Owin/AspNetCoreSelfHost.cs | 14 +++++++------- src/WireMock.Net/Owin/OwinSelfHost.cs | 6 +++--- src/WireMock.Net/Server/WireMockServer.cs | 4 ++-- src/dotnet-WireMock.Net/Program.cs | 10 +++++----- src/dotnet-WireMock.Net/WireMockLogger.cs | 4 ++-- 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/WireMock.Net.StandAlone/StandAloneApp.cs b/src/WireMock.Net.StandAlone/StandAloneApp.cs index 63388638..f86f4943 100644 --- a/src/WireMock.Net.StandAlone/StandAloneApp.cs +++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Linq; +using System.Reflection; using JetBrains.Annotations; using WireMock.Logging; using WireMock.Server; @@ -12,6 +13,8 @@ namespace WireMock.Net.StandAlone /// public static class StandAloneApp { + private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version.ToString(); + /// /// Start WireMock.Net standalone Server based on the IWireMockServerSettings. /// @@ -23,7 +26,8 @@ namespace WireMock.Net.StandAlone 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; } @@ -40,7 +44,8 @@ namespace WireMock.Net.StandAlone 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); } @@ -61,7 +66,8 @@ namespace WireMock.Net.StandAlone 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); return true; diff --git a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs index b70b8bff..47bd28bd 100644 --- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs +++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs @@ -1,4 +1,4 @@ -#if USE_ASPNETCORE +#if USE_ASPNETCORE using System; using System.Collections.Generic; using System.Linq; @@ -118,17 +118,17 @@ namespace WireMock.Owin }); #if NETSTANDARD1_3 - _logger.Info("WireMock.Net server using netstandard1.3"); + _logger.Info("Server using netstandard1.3"); #elif NETSTANDARD2_0 - _logger.Info("WireMock.Net server using netstandard2.0"); + _logger.Info("Server using netstandard2.0"); #elif NETSTANDARD2_1 - _logger.Info("WireMock.Net server using netstandard2.1"); + _logger.Info("Server using netstandard2.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 - _logger.Info("WireMock.Net server using .NET 5.0"); + _logger.Info("Server using .NET 5.0"); #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 #if NETSTANDARD1_3 diff --git a/src/WireMock.Net/Owin/OwinSelfHost.cs b/src/WireMock.Net/Owin/OwinSelfHost.cs index f9610cb3..779f28b3 100644 --- a/src/WireMock.Net/Owin/OwinSelfHost.cs +++ b/src/WireMock.Net/Owin/OwinSelfHost.cs @@ -1,4 +1,4 @@ -#if !USE_ASPNETCORE +#if !USE_ASPNETCORE using JetBrains.Annotations; using Microsoft.Owin.Hosting; using Owin; @@ -63,9 +63,9 @@ namespace WireMock.Owin private void StartServers() { #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 - _logger.Info("WireMock.Net server using .net 4.5.x"); + _logger.Info("Server using .net 4.5.x"); #endif var servers = new List(); diff --git a/src/WireMock.Net/Server/WireMockServer.cs b/src/WireMock.Net/Server/WireMockServer.cs index 07a0a3d2..6a721537 100644 --- a/src/WireMock.Net/Server/WireMockServer.cs +++ b/src/WireMock.Net/Server/WireMockServer.cs @@ -202,8 +202,8 @@ namespace WireMock.Server _settings.Logger = settings.Logger ?? new WireMockNullLogger(); _settings.FileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler(); - _settings.Logger.Info("WireMock.Net 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.Info("By Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)"); + _settings.Logger.Debug("Server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented)); HostUrlOptions urlOptions; if (settings.Urls != null) diff --git a/src/dotnet-WireMock.Net/Program.cs b/src/dotnet-WireMock.Net/Program.cs index a4e742d5..52cbd20a 100644 --- a/src/dotnet-WireMock.Net/Program.cs +++ b/src/dotnet-WireMock.Net/Program.cs @@ -4,7 +4,7 @@ using Microsoft.Extensions.Logging; using WireMock.Net.StandAlone; using WireMock.Server; -namespace WireMock +namespace WireMock.Net { public class Program { @@ -18,7 +18,7 @@ namespace WireMock options.SingleLine = false; options.TimestampFormat = "yyyy-MM-ddTHH:mm:ss "; }); - }).CreateLogger(string.Empty); + }).CreateLogger("WireMock.Net"); private static WireMockServer Server; @@ -43,16 +43,16 @@ namespace WireMock while (true) { - Logger.LogInformation("WireMock.Net server running : {IsStarted}", Server.IsStarted); + Logger.LogInformation("Server running : {IsStarted}", Server.IsStarted); await Task.Delay(SleepTime); } } private static void Stop(string why) { - Logger.LogInformation("WireMock.Net server stopping because '{why}'", why); + Logger.LogInformation("Server stopping because '{why}'", why); Server.Stop(); - Logger.LogInformation("WireMock.Net server stopped"); + Logger.LogInformation("Server stopped"); } } } \ No newline at end of file diff --git a/src/dotnet-WireMock.Net/WireMockLogger.cs b/src/dotnet-WireMock.Net/WireMockLogger.cs index b765a424..3cc2e459 100644 --- a/src/dotnet-WireMock.Net/WireMockLogger.cs +++ b/src/dotnet-WireMock.Net/WireMockLogger.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Text.Json; using Microsoft.Extensions.Logging; using WireMock.Admin.Requests; using WireMock.Logging; -namespace WireMock +namespace WireMock.Net { public class WireMockLogger : IWireMockLogger {