Added ILogger and cleanup

This commit is contained in:
Isaac Levin 2019-06-06 10:42:09 -04:00
parent 99a0e98464
commit 7983924871
20 changed files with 112 additions and 13 deletions

View File

@ -3,11 +3,17 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Grpc.Core;
using Microsoft.Extensions.Logging;
namespace GrpcService_CSharp
{
public class GreeterService : Greeter.GreeterBase
{
private readonly ILogger<GreeterService> logger;
public GreeterService(ILogger<GreeterService> _logger)
{
logger = _logger;
}
public override Task<HelloReply> SayHello(HelloRequest request, ServerCallContext context)
{
return Task.FromResult(new HelloReply

View File

@ -5,6 +5,7 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Logging;
namespace Company.WebApplication1.Pages
{
@ -15,6 +16,12 @@ namespace Company.WebApplication1.Pages
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
private readonly ILogger<ErrorModel> logger;
public ErrorModel(ILogger<ErrorModel> _logger)
{
logger = _logger;
}
public void OnGet()
{
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;

View File

@ -4,11 +4,18 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Logging;
namespace Company.WebApplication1.Pages
{
public class IndexModel : PageModel
{
private readonly ILogger<IndexModel> logger;
public ErrorModel(ILogger<IndexModel> _logger)
{
logger = _logger;
}
public void OnGet()
{

View File

@ -4,11 +4,18 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Logging;
namespace Company.WebApplication1.Pages
{
public class PrivacyModel : PageModel
{
private readonly ILogger<PrivacyModel> logger;
public ErrorModel(ILogger<PrivacyModel> _logger)
{
logger = _logger;
}
public void OnGet()
{
}

View File

@ -34,9 +34,12 @@
</div>
</nav>
</header>
<main role="main" class="pb-3">
<div class="container">
<main role="main" class="pb-3">
@RenderBody()
</main>
</main>
</div>
<footer class="border-top footer text-muted">
<div class="container">
&copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-page="/Privacy">Privacy</a>

View File

@ -1,2 +1,2 @@
<script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>

View File

@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Authorization;
#endif
using Microsoft.AspNetCore.Mvc;
using Company.WebApplication1.Models;
using Microsoft.Extensions.Logging;
namespace Company.WebApplication1.Controllers
{
@ -16,6 +17,12 @@ namespace Company.WebApplication1.Controllers
#endif
public class HomeController : Controller
{
private readonly ILogger<HomeController> logger;
public HomeController(ILogger<HomeController> _logger)
{
logger = _logger;
}
public IActionResult Index()
{
return View();

View File

@ -34,9 +34,12 @@
</div>
</nav>
</header>
<main role="main" class="pb-3">
<div class="container">
<main role="main" class="pb-3">
@RenderBody()
</main>
</main>
</div>
<footer class="border-top footer text-muted">
<div class="container">
&copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>

View File

@ -5,9 +5,11 @@ open System.Collections.Generic
open System.Linq
open System.Threading.Tasks
open Microsoft.AspNetCore.Mvc
open Microsoft.Extensions.Logging
type HomeController () =
type HomeController (_logger : ILogger<HomeController>) =
inherit Controller()
let mutable logger = _logger
member this.Index () =
this.View()

View File

@ -30,9 +30,12 @@
</div>
</nav>
</header>
<main role="main" class="pb-3">
<div class="container">
<main role="main" class="pb-3">
@RenderBody()
</main>
</main>
</div>
<footer class="border-top footer text-muted">
<div class="container">
&copy; copyrightYear - Company.WebApplication1 - <a asp-area="" asp-controller="Home" asp-action="Privacy">Privacy</a>

View File

@ -6,6 +6,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
#endif
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
namespace Company.WebApplication1.Controllers
{
@ -17,6 +18,12 @@ namespace Company.WebApplication1.Controllers
[ApiController]
public class WeatherController : ControllerBase
{
private readonly ILogger<WeatherController> logger;
public WeatherController(ILogger<WeatherController> _logger)
{
logger = _logger;
}
[HttpGet]
public ActionResult<WeatherResult> GetWeatherForecasts(string location, TemperatureUnit unit)
{

View File

@ -5,6 +5,7 @@ open System.Collections.Generic
open System.Linq
open System.Threading.Tasks
open Microsoft.AspNetCore.Mvc
open Microsoft.Extensions.Logging
type public TemperatureUnit =
| Celsius=0
@ -18,8 +19,9 @@ type WeatherResult = {
[<Route("api/SampleData/[controller]")>]
[<ApiController>]
type WeatherController () =
type WeatherController (_logger : ILogger<WeatherController>) =
inherit ControllerBase()
let mutable logger = _logger
[<HttpGet>]
member this.Get(location:string, unit: TemperatureUnit) =

View File

@ -1,13 +1,17 @@
using Microsoft.AspNetCore.ApiAuthorization.IdentityServer;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
namespace Company.WebApplication1.Controllers
{
public class OidcConfigurationController : Controller
{
public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
private readonly ILogger<SampleDataController> logger;
public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<SampleDataController> _logger)
{
ClientRequestParametersProvider = clientRequestParametersProvider;
logger = _logger;
}
public IClientRequestParametersProvider ClientRequestParametersProvider { get; }

View File

@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc;
#if (IndividualLocalAuth)
using Microsoft.AspNetCore.Authorization;
#endif
using Microsoft.Extensions.Logging;
namespace Company.WebApplication1.Controllers
{
@ -15,6 +16,12 @@ namespace Company.WebApplication1.Controllers
[Route("api/[controller]")]
public class SampleDataController : Controller
{
private readonly ILogger<SampleDataController> logger;
public SampleDataController(ILogger<SampleDataController> _logger)
{
logger = _logger;
}
private static string[] Summaries = new[]
{
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"

View File

@ -5,12 +5,19 @@ using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Logging;
namespace Company.WebApplication1.Pages
{
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public class ErrorModel : PageModel
{
private readonly ILogger<ErrorModel> logger;
public ErrorModel(ILogger<ErrorModel> _logger)
{
logger = _logger;
}
public string RequestId { get; set; }
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);

View File

@ -5,9 +5,12 @@ namespace Company.WebApplication1.Controllers
{
public class OidcConfigurationController : Controller
{
public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider)
private readonly ILogger<SampleDataController> logger;
public OidcConfigurationController(IClientRequestParametersProvider clientRequestParametersProvider, ILogger<SampleDataController> _logger)
{
ClientRequestParametersProvider = clientRequestParametersProvider;
logger = _logger;
}
public IClientRequestParametersProvider ClientRequestParametersProvider { get; }

View File

@ -9,12 +9,18 @@ using Microsoft.AspNetCore.Mvc;
namespace Company.WebApplication1.Controllers
{
#if (IndividualLocalAuth)
#if (IndividualLocalAuth)
[Authorize]
#endif
#endif
[Route("api/[controller]")]
public class SampleDataController : Controller
{
private readonly ILogger<SampleDataController> logger;
public SampleDataController(ILogger<SampleDataController> _logger)
{
logger = _logger;
}
private static string[] Summaries = new[]
{
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"

View File

@ -11,6 +11,12 @@ namespace Company.WebApplication1.Pages
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public class ErrorModel : PageModel
{
private readonly ILogger<ErrorModel> logger;
public ErrorModel(ILogger<ErrorModel> _logger)
{
logger = _logger;
}
public string RequestId { get; set; }
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);

View File

@ -9,6 +9,12 @@ namespace Company.WebApplication1.Controllers
[Route("api/[controller]")]
public class SampleDataController : Controller
{
private readonly ILogger<SampleDataController> logger;
public SampleDataController(ILogger<SampleDataController> _logger)
{
logger = _logger;
}
private static string[] Summaries = new[]
{
"Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"

View File

@ -11,6 +11,12 @@ namespace Company.WebApplication1.Pages
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public class ErrorModel : PageModel
{
private readonly ILogger<ErrorModel> logger;
public ErrorModel(ILogger<ErrorModel> _logger)
{
logger = _logger;
}
public string RequestId { get; set; }
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);