From 8bada2cb8869a6199b0b2098f27168609013cd7b Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 14 Apr 2017 18:25:49 +0200 Subject: [PATCH] Logging fixed --- src/Squidex.Core/Squidex.Core.csproj | 2 +- .../Log/Internal/AnsiLogConsole.cs | 5 ++--- .../Log/Internal/WindowsLogConsole.cs | 15 +++++++++++---- .../Squidex.Read.MongoDb.csproj | 2 +- src/Squidex/Config/Swagger/XmlTagProcessor.cs | 4 +++- src/Squidex/Squidex.csproj | 8 ++++---- 6 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/Squidex.Core/Squidex.Core.csproj b/src/Squidex.Core/Squidex.Core.csproj index d5cb482ce..315417db2 100644 --- a/src/Squidex.Core/Squidex.Core.csproj +++ b/src/Squidex.Core/Squidex.Core.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs b/src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs index 41666b8cf..f5df96cea 100644 --- a/src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs +++ b/src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs @@ -25,15 +25,14 @@ namespace Squidex.Infrastructure.Log.Internal outputBuilder.Append(message); outputBuilder.Append("\x1B[39m\x1B[22m"); outputBuilder.AppendLine(); + outputBuilder.Clear(); Console.Error.Write(outputBuilder.ToString()); } else { - Console.Out.Write(outputBuilder.ToString()); + Console.WriteLine(message); } - - outputBuilder.Clear(); } } } diff --git a/src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs b/src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs index b471cc5a5..41118b1a2 100644 --- a/src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs +++ b/src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs @@ -16,13 +16,20 @@ namespace Squidex.Infrastructure.Log.Internal { if (level >= SemanticLogLevel.Error) { - Console.ForegroundColor = ConsoleColor.Red; - Console.Error.WriteLine(message); - Console.ResetColor(); + try + { + Console.ForegroundColor = ConsoleColor.Red; + + Console.Error.WriteLine(message); + } + finally + { + Console.ResetColor(); + } } else { - Console.Out.WriteLine(message); + Console.WriteLine(message); } } } diff --git a/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj b/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj index 6248495aa..836dbff66 100644 --- a/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj +++ b/src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Squidex/Config/Swagger/XmlTagProcessor.cs b/src/Squidex/Config/Swagger/XmlTagProcessor.cs index 19847d1bb..e2a13d080 100644 --- a/src/Squidex/Config/Swagger/XmlTagProcessor.cs +++ b/src/Squidex/Config/Swagger/XmlTagProcessor.cs @@ -20,7 +20,7 @@ namespace Squidex.Config.Swagger { public sealed class XmlTagProcessor : IOperationProcessor, IDocumentProcessor { - public void Process(DocumentProcessorContext context) + public Task ProcessAsync(DocumentProcessorContext context) { foreach (var controllerType in context.ControllerTypes) { @@ -46,6 +46,8 @@ namespace Squidex.Config.Swagger } } } + + return TaskHelper.Done; } public Task ProcessAsync(OperationProcessorContext context) diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index 06046590b..336c1e2c4 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -33,9 +33,9 @@ - + - + @@ -57,9 +57,9 @@ - + - +