Browse Source

Logging fixed

pull/65/head
Sebastian Stehle 10 years ago
parent
commit
8bada2cb88
  1. 2
      src/Squidex.Core/Squidex.Core.csproj
  2. 5
      src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs
  3. 15
      src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs
  4. 2
      src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj
  5. 4
      src/Squidex/Config/Swagger/XmlTagProcessor.cs
  6. 8
      src/Squidex/Squidex.csproj

2
src/Squidex.Core/Squidex.Core.csproj

@ -14,7 +14,7 @@
<PackageReference Include="protobuf-net" Version="2.1.0" /> <PackageReference Include="protobuf-net" Version="2.1.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.3.1" /> <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
<PackageReference Include="NodaTime" Version="2.0.0" /> <PackageReference Include="NodaTime" Version="2.0.0" />
<PackageReference Include="NJsonSchema" Version="8.27.6302.16041" /> <PackageReference Include="NJsonSchema" Version="8.30.6304.31883" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' "> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
<PackageReference Include="Microsoft.OData.Core" Version="6.15.0" /> <PackageReference Include="Microsoft.OData.Core" Version="6.15.0" />

5
src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs

@ -25,15 +25,14 @@ namespace Squidex.Infrastructure.Log.Internal
outputBuilder.Append(message); outputBuilder.Append(message);
outputBuilder.Append("\x1B[39m\x1B[22m"); outputBuilder.Append("\x1B[39m\x1B[22m");
outputBuilder.AppendLine(); outputBuilder.AppendLine();
outputBuilder.Clear();
Console.Error.Write(outputBuilder.ToString()); Console.Error.Write(outputBuilder.ToString());
} }
else else
{ {
Console.Out.Write(outputBuilder.ToString()); Console.WriteLine(message);
} }
outputBuilder.Clear();
} }
} }
} }

15
src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs

@ -16,13 +16,20 @@ namespace Squidex.Infrastructure.Log.Internal
{ {
if (level >= SemanticLogLevel.Error) if (level >= SemanticLogLevel.Error)
{ {
Console.ForegroundColor = ConsoleColor.Red; try
Console.Error.WriteLine(message); {
Console.ResetColor(); Console.ForegroundColor = ConsoleColor.Red;
Console.Error.WriteLine(message);
}
finally
{
Console.ResetColor();
}
} }
else else
{ {
Console.Out.WriteLine(message); Console.WriteLine(message);
} }
} }
} }

2
src/Squidex.Read.MongoDb/Squidex.Read.MongoDb.csproj

@ -15,7 +15,7 @@
<ProjectReference Include="..\Squidex.Read\Squidex.Read.csproj" /> <ProjectReference Include="..\Squidex.Read\Squidex.Read.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityServer4" Version="1.4.2" /> <PackageReference Include="IdentityServer4" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.1" /> <PackageReference Include="Microsoft.AspNetCore.Identity" Version="1.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Identity.MongoDB" Version="1.0.2" /> <PackageReference Include="Microsoft.AspNetCore.Identity.MongoDB" Version="1.0.2" />
<PackageReference Include="MongoDB.Driver" Version="2.4.3" /> <PackageReference Include="MongoDB.Driver" Version="2.4.3" />

4
src/Squidex/Config/Swagger/XmlTagProcessor.cs

@ -20,7 +20,7 @@ namespace Squidex.Config.Swagger
{ {
public sealed class XmlTagProcessor : IOperationProcessor, IDocumentProcessor public sealed class XmlTagProcessor : IOperationProcessor, IDocumentProcessor
{ {
public void Process(DocumentProcessorContext context) public Task ProcessAsync(DocumentProcessorContext context)
{ {
foreach (var controllerType in context.ControllerTypes) foreach (var controllerType in context.ControllerTypes)
{ {
@ -46,6 +46,8 @@ namespace Squidex.Config.Swagger
} }
} }
} }
return TaskHelper.Done;
} }
public Task<bool> ProcessAsync(OperationProcessorContext context) public Task<bool> ProcessAsync(OperationProcessorContext context)

8
src/Squidex/Squidex.csproj

@ -33,9 +33,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac" Version="4.4.0" /> <PackageReference Include="Autofac" Version="4.5.0" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" /> <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.0.0" />
<PackageReference Include="IdentityServer4" Version="1.4.2" /> <PackageReference Include="IdentityServer4" Version="1.5.0" />
<PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.1.0" /> <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="1.1.0" />
<PackageReference Include="IdentityServer4.AspNetIdentity" Version="1.0.1" /> <PackageReference Include="IdentityServer4.AspNetIdentity" Version="1.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.1" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.1" />
@ -57,9 +57,9 @@
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.1" />
<PackageReference Include="MongoDB.Driver" Version="2.4.3" /> <PackageReference Include="MongoDB.Driver" Version="2.4.3" />
<PackageReference Include="NJsonSchema" Version="8.27.6302.16041" /> <PackageReference Include="NJsonSchema" Version="8.30.6304.31883" />
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" /> <PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" />
<PackageReference Include="NSwag.AspNetCore" Version="9.12.0" /> <PackageReference Include="NSwag.AspNetCore" Version="10.1.0" />
<PackageReference Include="OpenCover" Version="4.6.519" /> <PackageReference Include="OpenCover" Version="4.6.519" />
<PackageReference Include="ReportGenerator" Version="2.5.6" /> <PackageReference Include="ReportGenerator" Version="2.5.6" />
<PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.1" /> <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.1" />

Loading…
Cancel
Save