Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Due to braking changes in Microsoft.Extensions.Logging library, FormattedLogValues is now marked as internal. Therefore, it is changed to IEnumerable<KeyValuePair<string, object>> to make the library compatible with .NET Core 3.0 version.
- Loading branch information
Namık Barış İdil
committed
Apr 24, 2019
1 parent
5391521
commit cc57636
Showing
9 changed files
with
233 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
samples/Gelf.Extensions.Logging.Samples.AspNetCore3/Controllers/ValuesController.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Mvc; | ||
|
|
||
| namespace Gelf.Extensions.Logging.Samples.AspNetCore3.Controllers | ||
| { | ||
| [Route("api/[controller]")] | ||
| [ApiController] | ||
| public class ValuesController : ControllerBase | ||
| { | ||
| // GET api/values | ||
| [HttpGet] | ||
| public ActionResult<IEnumerable<string>> Get() | ||
| { | ||
| return new string[] { "value1", "value2" }; | ||
| } | ||
|
|
||
| // GET api/values/5 | ||
| [HttpGet("{id}")] | ||
| public ActionResult<string> Get(int id) | ||
| { | ||
| return "value"; | ||
| } | ||
|
|
||
| // POST api/values | ||
| [HttpPost] | ||
| public void Post([FromBody] string value) | ||
| { | ||
| } | ||
|
|
||
| // PUT api/values/5 | ||
| [HttpPut("{id}")] | ||
| public void Put(int id, [FromBody] string value) | ||
| { | ||
| } | ||
|
|
||
| // DELETE api/values/5 | ||
| [HttpDelete("{id}")] | ||
| public void Delete(int id) | ||
| { | ||
| } | ||
| } | ||
| } |
15 changes: 15 additions & 0 deletions
15
...Extensions.Logging.Samples.AspNetCore3/Gelf.Extensions.Logging.Samples.AspNetCore3.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>netcoreapp3.0</TargetFramework> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview4-19216-03" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\src\Gelf.Extensions.Logging\Gelf.Extensions.Logging.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
40 changes: 40 additions & 0 deletions
40
samples/Gelf.Extensions.Logging.Samples.AspNetCore3/Program.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| using Microsoft.AspNetCore.Hosting; | ||
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.Hosting; | ||
| using Microsoft.Extensions.Logging; | ||
| using System; | ||
| using System.Reflection; | ||
|
|
||
| namespace Gelf.Extensions.Logging.Samples.AspNetCore3 | ||
| { | ||
| public class Program | ||
| { | ||
| public static void Main(string[] args) | ||
| { | ||
| CreateHostBuilder(args).Build().Run(); | ||
| } | ||
|
|
||
| public static IHostBuilder CreateHostBuilder(string[] args) | ||
| { | ||
| return Host.CreateDefaultBuilder(args) | ||
| .ConfigureLogging((context, builder) => | ||
| { | ||
| builder.AddConfiguration(context.Configuration.GetSection("Logging")) | ||
| .AddConsole() | ||
| .AddDebug() | ||
| .AddGelf(options => | ||
| { | ||
| // Optional config combined with Logging:GELF configuration section. | ||
| options.LogSource = context.HostingEnvironment.ApplicationName; | ||
| options.AdditionalFields["machine_name"] = Environment.MachineName; | ||
| options.AdditionalFields["app_version"] = Assembly.GetEntryAssembly() | ||
| .GetCustomAttribute<AssemblyInformationalVersionAttribute>().InformationalVersion; | ||
| }); | ||
| }) | ||
| .ConfigureWebHostDefaults(webBuilder => | ||
| { | ||
| webBuilder.UseStartup<Startup>(); | ||
| }); | ||
| } | ||
| } | ||
| } |
30 changes: 30 additions & 0 deletions
30
samples/Gelf.Extensions.Logging.Samples.AspNetCore3/Properties/launchSettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| { | ||
| "$schema": "http://json.schemastore.org/launchsettings.json", | ||
| "iisSettings": { | ||
| "windowsAuthentication": false, | ||
| "anonymousAuthentication": true, | ||
| "iisExpress": { | ||
| "applicationUrl": "http://localhost:50420", | ||
| "sslPort": 44356 | ||
| } | ||
| }, | ||
| "profiles": { | ||
| "IIS Express": { | ||
| "commandName": "IISExpress", | ||
| "launchBrowser": true, | ||
| "launchUrl": "api/values", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| } | ||
| }, | ||
| "Gelf.Extensions.Logging.Samples.AspNetCore3": { | ||
| "commandName": "Project", | ||
| "launchBrowser": true, | ||
| "launchUrl": "api/values", | ||
| "applicationUrl": "https://localhost:5001;http://localhost:5000", | ||
| "environmentVariables": { | ||
| "ASPNETCORE_ENVIRONMENT": "Development" | ||
| } | ||
| } | ||
| } | ||
| } |
57 changes: 57 additions & 0 deletions
57
samples/Gelf.Extensions.Logging.Samples.AspNetCore3/Startup.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Threading.Tasks; | ||
| using Microsoft.AspNetCore.Builder; | ||
| using Microsoft.AspNetCore.Hosting; | ||
| using Microsoft.AspNetCore.HttpsPolicy; | ||
| using Microsoft.AspNetCore.Mvc; | ||
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Hosting; | ||
| using Microsoft.Extensions.Logging; | ||
|
|
||
| namespace Gelf.Extensions.Logging.Samples.AspNetCore3 | ||
| { | ||
| public class Startup | ||
| { | ||
| public Startup(IConfiguration configuration) | ||
| { | ||
| Configuration = configuration; | ||
| } | ||
|
|
||
| public IConfiguration Configuration { get; } | ||
|
|
||
| // This method gets called by the runtime. Use this method to add services to the container. | ||
| public void ConfigureServices(IServiceCollection services) | ||
| { | ||
| services.AddControllers() | ||
| .AddNewtonsoftJson(); | ||
| } | ||
|
|
||
| // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. | ||
| public void Configure(IApplicationBuilder app, IWebHostEnvironment env) | ||
| { | ||
| if (env.IsDevelopment()) | ||
| { | ||
| app.UseDeveloperExceptionPage(); | ||
| } | ||
| else | ||
| { | ||
| // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts. | ||
| app.UseHsts(); | ||
| } | ||
|
|
||
| app.UseHttpsRedirection(); | ||
|
|
||
| app.UseRouting(); | ||
|
|
||
| app.UseAuthorization(); | ||
|
|
||
| app.UseEndpoints(endpoints => | ||
| { | ||
| endpoints.MapControllers(); | ||
| }); | ||
| } | ||
| } | ||
| } |
9 changes: 9 additions & 0 deletions
9
samples/Gelf.Extensions.Logging.Samples.AspNetCore3/appsettings.Development.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| { | ||
| "Logging": { | ||
| "LogLevel": { | ||
| "Default": "Debug", | ||
| "System": "Information", | ||
| "Microsoft": "Information" | ||
| } | ||
| } | ||
| } |
25 changes: 25 additions & 0 deletions
25
samples/Gelf.Extensions.Logging.Samples.AspNetCore3/appsettings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "Logging": { | ||
| "LogLevel": { | ||
| "Default": "Warning" | ||
| }, | ||
| "Console": { | ||
| "LogLevel": { | ||
| "Default": "Information", | ||
| "Microsoft.AspNetCore.Mvc.Razor.Internal": "Warning", | ||
| "Microsoft.AspNetCore.Mvc.Razor.Razor": "Debug", | ||
| "Microsoft.AspNetCore.Mvc.Razor": "Error" | ||
| } | ||
| }, | ||
| "GELF": { | ||
| "Host": "localhost", | ||
| "AdditionalFields": { | ||
| "project_name": "my-project" | ||
| }, | ||
| "LogLevel": { | ||
| "Default": "Information", | ||
| "Gelf.Extensions.Logging.Samples.AspNetCore2.Controllers": "Debug" | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters