Browse Source

Logging improved.

pull/249/head
Sebastian Stehle 8 years ago
parent
commit
3f80c5c267
  1. 5
      src/Squidex/Config/Orleans/SiloWrapper.cs
  2. 4
      src/Squidex/Program.cs
  3. 2
      src/Squidex/Squidex.csproj

5
src/Squidex/Config/Orleans/SiloWrapper.cs

@ -10,6 +10,7 @@ using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Orleans; using Orleans;
using Orleans.Configuration; using Orleans.Configuration;
using Orleans.Hosting; using Orleans.Hosting;
@ -57,9 +58,11 @@ namespace Squidex.Config.Orleans
{ {
options.ClusterId = "squidex"; options.ClusterId = "squidex";
}) })
.ConfigureLogging(builder => .ConfigureLogging((hostingContext, builder) =>
{ {
builder.AddConfiguration(hostingContext.Configuration.GetSection("logging"));
builder.AddSemanticLog(); builder.AddSemanticLog();
builder.AddFilter("Orleans.Runtime.SiloControl", LogLevel.Warning);
}) })
.ConfigureApplicationParts(builder => .ConfigureApplicationParts(builder =>
{ {

4
src/Squidex/Program.cs

@ -8,6 +8,7 @@
using System.IO; using System.IO;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Orleans; using Orleans;
using Orleans.Hosting; using Orleans.Hosting;
using Squidex.Infrastructure.Log.Adapter; using Squidex.Infrastructure.Log.Adapter;
@ -23,8 +24,9 @@ namespace Squidex
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration() .UseIISIntegration()
.UseStartup<WebStartup>() .UseStartup<WebStartup>()
.ConfigureLogging(builder => .ConfigureLogging((hostingContext, builder) =>
{ {
builder.AddConfiguration(hostingContext.Configuration.GetSection("logging"));
builder.AddSemanticLog(); builder.AddSemanticLog();
}) })
.ConfigureAppConfiguration((hostContext, builder) => .ConfigureAppConfiguration((hostContext, builder) =>

2
src/Squidex/Squidex.csproj

@ -79,7 +79,7 @@
<PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" /> <PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" />
<PackageReference Include="NSwag.AspNetCore" Version="11.15.3" /> <PackageReference Include="NSwag.AspNetCore" Version="11.15.3" />
<PackageReference Include="OpenCover" Version="4.6.519" /> <PackageReference Include="OpenCover" Version="4.6.519" />
<PackageReference Include="Orleans.Providers.MongoDB" Version="2.0.0-rc1" /> <PackageReference Include="Orleans.Providers.MongoDB" Version="2.0.0-rc2" />
<PackageReference Include="OrleansDashboard" Version="2.0.0-rc1" /> <PackageReference Include="OrleansDashboard" Version="2.0.0-rc1" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="ReportGenerator" Version="3.1.2" /> <PackageReference Include="ReportGenerator" Version="3.1.2" />

Loading…
Cancel
Save