huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix samples logging (#1205)

This commit is contained in:
BrennanConroy 2017-05-09 08:57:39 -07:00 committed by GitHub
parent 85dcdcc92c
commit b7a5a6044d
10 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/CookieSample/Program.cs
View File

@ -1,5 +1,6 @@
using System.IO; using System.IO;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;
namespace CookieSample namespace CookieSample
{ {
@ -8,6 +9,11 @@ namespace CookieSample
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.ConfigureLogging(factory =>
{
factory.AddConsole();
factory.AddFilter("Console", level => level >= LogLevel.Information);
})
.UseKestrel() .UseKestrel()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration() .UseIISIntegration()

5
samples/CookieSample/Startup.cs
View File

@ -6,7 +6,6 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
namespace CookieSample namespace CookieSample
{ {
@ -17,10 +16,8 @@ namespace CookieSample
services.AddCookieAuthentication(); services.AddCookieAuthentication();
} }
public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory) public void Configure(IApplicationBuilder app)
{ {
loggerfactory.AddConsole(LogLevel.Information);
app.UseAuthentication(); app.UseAuthentication();
app.Run(async context => app.Run(async context =>

7
samples/CookieSessionSample/Program.cs
View File

@ -1,6 +1,6 @@
using System.IO; using System.IO;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging;
namespace CookieSessionSample namespace CookieSessionSample
{ {
@ -9,6 +9,11 @@ namespace CookieSessionSample
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.ConfigureLogging(factory =>
{
factory.AddConsole();
factory.AddFilter("Console", level => level >= LogLevel.Information);
})
.UseKestrel() .UseKestrel()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration() .UseIISIntegration()

5
samples/CookieSessionSample/Startup.cs
View File

@ -7,7 +7,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.Cookies;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
namespace CookieSessionSample namespace CookieSessionSample
{ {
@ -18,10 +17,8 @@ namespace CookieSessionSample
services.AddCookieAuthentication(o => o.SessionStore = new MemoryCacheTicketStore()); services.AddCookieAuthentication(o => o.SessionStore = new MemoryCacheTicketStore());
} }
public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory) public void Configure(IApplicationBuilder app)
{ {
loggerfactory.AddConsole(LogLevel.Information);
app.UseAuthentication(); app.UseAuthentication();
app.Run(async context => app.Run(async context =>

6
samples/OpenIdConnect.AzureAdSample/Program.cs
View File

@ -1,5 +1,6 @@
using System.IO; using System.IO;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;
namespace OpenIdConnect.AzureAdSample namespace OpenIdConnect.AzureAdSample
{ {
@ -8,6 +9,11 @@ namespace OpenIdConnect.AzureAdSample
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.ConfigureLogging(factory =>
{
factory.AddConsole();
factory.AddFilter("Console", level => level >= LogLevel.Information);
})
.UseKestrel() .UseKestrel()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.UseIISIntegration() .UseIISIntegration()

5
samples/OpenIdConnect.AzureAdSample/Startup.cs
View File

@ -12,7 +12,6 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Extensions; using Microsoft.AspNetCore.Http.Extensions;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Clients.ActiveDirectory; using Microsoft.IdentityModel.Clients.ActiveDirectory;
using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Microsoft.IdentityModel.Protocols.OpenIdConnect;
@ -79,10 +78,8 @@ namespace OpenIdConnect.AzureAdSample
}); });
} }
public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory) public void Configure(IApplicationBuilder app)
{ {
loggerfactory.AddConsole(Microsoft.Extensions.Logging.LogLevel.Information);
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
app.UseAuthentication(); app.UseAuthentication();

8
samples/OpenIdConnectSample/Program.cs
View File

@ -5,6 +5,7 @@ using System.Reflection;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Logging;
namespace OpenIdConnectSample namespace OpenIdConnectSample
{ {
@ -13,6 +14,13 @@ namespace OpenIdConnectSample
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.ConfigureLogging(factory =>
{
factory.AddConsole();
factory.AddDebug();
factory.AddFilter("Console", level => level >= LogLevel.Information);
factory.AddFilter("Debug", level => level >= LogLevel.Information);
})
.UseKestrel(options => .UseKestrel(options =>
{ {
if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_PORT"))) if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_PORT")))

6
samples/OpenIdConnectSample/Startup.cs
View File

@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.IdentityModel.Protocols.OpenIdConnect; using Microsoft.IdentityModel.Protocols.OpenIdConnect;
namespace OpenIdConnectSample namespace OpenIdConnectSample
@ -76,11 +75,8 @@ namespace OpenIdConnectSample
}); });
} }
public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory) public void Configure(IApplicationBuilder app)
{ {
loggerfactory.AddConsole(LogLevel.Information);
loggerfactory.AddDebug(LogLevel.Information);
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
app.UseAuthentication(); app.UseAuthentication();

7
samples/SocialSample/Program.cs
View File

@ -4,8 +4,8 @@ using System.Net;
using System.Reflection; using System.Reflection;
using System.Security.Cryptography.X509Certificates; using System.Security.Cryptography.X509Certificates;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.FileProviders; using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Logging;
namespace SocialSample namespace SocialSample
{ {
@ -14,6 +14,11 @@ namespace SocialSample
public static void Main(string[] args) public static void Main(string[] args)
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.ConfigureLogging(factory =>
{
factory.AddConsole();
factory.AddFilter("Console", level => level >= LogLevel.Information);
})
.UseKestrel(options => .UseKestrel(options =>
{ {
if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_PORT"))) if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("ASPNETCORE_PORT")))

5
samples/SocialSample/Startup.cs
View File

@ -16,7 +16,6 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
namespace SocialSample namespace SocialSample
@ -209,10 +208,8 @@ namespace SocialSample
}); });
} }
public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory) public void Configure(IApplicationBuilder app)
{ {
loggerfactory.AddConsole(LogLevel.Information);
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
app.UseAuthentication(); app.UseAuthentication();