From 4068c4b0c85086dfecf4ae3321f0e420365e7968 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Fri, 6 Aug 2021 20:24:45 +0100 Subject: [PATCH] Use shared config --- .../TransactionProcessorACL.BusinessLogic.csproj | 2 +- ...ransactionProcessorACL.IntegrationTests.csproj | 4 ++-- TransactionProcessorACL/Dockerfile | 2 +- TransactionProcessorACL/Startup.cs | 11 ++++++++++- .../TransactionProcessorACL.csproj | 2 +- TransactionProcessorACL/appsettings.json | 15 ++------------- 6 files changed, 17 insertions(+), 19 deletions(-) diff --git a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj index 2d344f8..788dd1c 100644 --- a/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj +++ b/TransactionProcessorACL.BusinessLogic/TransactionProcessorACL.BusinessLogic.csproj @@ -7,7 +7,7 @@ - + diff --git a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj index 0210cab..37e9171 100644 --- a/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj +++ b/TransactionProcessorACL.IntegrationTests/TransactionProcessorACL.IntegrationTests.csproj @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/TransactionProcessorACL/Dockerfile b/TransactionProcessorACL/Dockerfile index 6a0d2ab..c271535 100644 --- a/TransactionProcessorACL/Dockerfile +++ b/TransactionProcessorACL/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base +FROM stuartferguson/txnprocbase:latest AS base WORKDIR /app FROM mcr.microsoft.com/dotnet/sdk:5.0.102-ca-patch-buster-slim AS build diff --git a/TransactionProcessorACL/Startup.cs b/TransactionProcessorACL/Startup.cs index f4500a5..02bd940 100644 --- a/TransactionProcessorACL/Startup.cs +++ b/TransactionProcessorACL/Startup.cs @@ -50,8 +50,11 @@ public class Startup public Startup(IWebHostEnvironment webHostEnvironment) { IConfigurationBuilder builder = new ConfigurationBuilder().SetBasePath(webHostEnvironment.ContentRootPath) + .AddJsonFile("/home/txnproc/config/appsettings.json", true, true) + .AddJsonFile($"/home/txnproc/config/appsettings.{webHostEnvironment.EnvironmentName}.json", optional: true) .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{webHostEnvironment.EnvironmentName}.json", optional: true).AddEnvironmentVariables(); + .AddJsonFile($"appsettings.{webHostEnvironment.EnvironmentName}.json", optional: true, reloadOnChange: true) + .AddEnvironmentVariables(); Startup.Configuration = builder.Build(); Startup.WebHostEnvironment = webHostEnvironment; @@ -213,6 +216,12 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF Logger.Initialise(logger); + Action loggerAction = message => + { + Logger.LogInformation(message); + }; + Startup.Configuration.LogConfiguration(loggerAction); + app.AddRequestLogging(); app.AddResponseLogging(); app.AddExceptionHandler(); diff --git a/TransactionProcessorACL/TransactionProcessorACL.csproj b/TransactionProcessorACL/TransactionProcessorACL.csproj index ba99167..5b0b198 100644 --- a/TransactionProcessorACL/TransactionProcessorACL.csproj +++ b/TransactionProcessorACL/TransactionProcessorACL.csproj @@ -20,7 +20,7 @@ - + diff --git a/TransactionProcessorACL/appsettings.json b/TransactionProcessorACL/appsettings.json index 5f98c58..fa1c63b 100644 --- a/TransactionProcessorACL/appsettings.json +++ b/TransactionProcessorACL/appsettings.json @@ -1,21 +1,10 @@ { - "Logging": { - "LogLevel": { - "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" - } - }, "AppSettings": { - "SecurityService": "https://192.168.1.133:5001", "ClientId": "serviceClient", "ClientSecret": "d192cbc46d834d0da90e8a9d50ded543", - "TransactionProcessorApi": "http://192.168.1.133:5002", "MinimumSupportedApplicationVersion": "1.0.5" }, "SecurityConfiguration": { - "ApiName": "transactionProcessorACL", - "Authority": "https://192.168.1.133:5001" - }, - "AllowedHosts": "*" + "ApiName": "transactionProcessorACL" + } }