diff --git a/src/Catalog/Catalog.Api/Program.cs b/src/Catalog/Catalog.Api/Program.cs index 884e158..03bcad7 100644 --- a/src/Catalog/Catalog.Api/Program.cs +++ b/src/Catalog/Catalog.Api/Program.cs @@ -1,5 +1,5 @@ using Catalog.Api; -using Catalog.Api.Infrastructure; +using Ecommerce.Core.WebApi.Infrastructure; using Ecommerce.Core.WebApi.Swagger; using Eventuous.Spyglass; using Microsoft.AspNetCore.Http.Json; diff --git a/src/Core/Ecommerce.Core.WebApi/Ecommerce.Core.WebApi.csproj b/src/Core/Ecommerce.Core.WebApi/Ecommerce.Core.WebApi.csproj index 5df5d39..c13d5de 100644 --- a/src/Core/Ecommerce.Core.WebApi/Ecommerce.Core.WebApi.csproj +++ b/src/Core/Ecommerce.Core.WebApi/Ecommerce.Core.WebApi.csproj @@ -6,6 +6,9 @@ + + + diff --git a/src/Catalog/Catalog.Api/Infrastructure/Logging.cs b/src/Core/Ecommerce.Core.WebApi/Infrastructure/Logging.cs similarity index 93% rename from src/Catalog/Catalog.Api/Infrastructure/Logging.cs rename to src/Core/Ecommerce.Core.WebApi/Infrastructure/Logging.cs index 30a37e5..cb42e44 100644 --- a/src/Catalog/Catalog.Api/Infrastructure/Logging.cs +++ b/src/Core/Ecommerce.Core.WebApi/Infrastructure/Logging.cs @@ -1,7 +1,8 @@ +using Microsoft.Extensions.Configuration; using Serilog; using Serilog.Events; -namespace Catalog.Api.Infrastructure; +namespace Ecommerce.Core.WebApi.Infrastructure; public static class Logging { diff --git a/src/Retail/ShoppingCart.Api/Infrastructure/Logging.cs b/src/Retail/ShoppingCart.Api/Infrastructure/Logging.cs deleted file mode 100644 index 980aac6..0000000 --- a/src/Retail/ShoppingCart.Api/Infrastructure/Logging.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Serilog; -using Serilog.Events; - -namespace ShoppingCart.Api.Infrastructure; - -public static class Logging -{ - public static void ConfigureLog(IConfiguration config) - => Log.Logger = new LoggerConfiguration() - .MinimumLevel.Verbose() - .MinimumLevel.Override("Microsoft", LogEventLevel.Information) - .MinimumLevel.Override("Microsoft.AspNetCore.Hosting.Diagnostics", LogEventLevel.Warning) - .MinimumLevel.Override("Microsoft.AspNetCore.Mvc.Infrastructure", LogEventLevel.Warning) - .MinimumLevel.Override("Microsoft.AspNetCore.Routing", LogEventLevel.Warning) - .MinimumLevel.Override("Grpc", LogEventLevel.Information) - .MinimumLevel.Override("Grpc.Net.Client.Internal.GrpcCall", LogEventLevel.Error) - .MinimumLevel.Override("EventStore", LogEventLevel.Information) - .Enrich.FromLogContext() - .WriteTo.Console( - outputTemplate: - "[{Timestamp:HH:mm:ss} {Level:u3}] {Message:lj} {NewLine}{Exception}" - ) - .WriteTo.Seq(config["Seq:ServerUrl"]!) - .CreateLogger(); -} - -public record SeqConfig -{ - public string ServerUrl { get; init; } = null!; -} diff --git a/src/Retail/ShoppingCart.Api/Program.cs b/src/Retail/ShoppingCart.Api/Program.cs index 84ffe51..5ffc92f 100644 --- a/src/Retail/ShoppingCart.Api/Program.cs +++ b/src/Retail/ShoppingCart.Api/Program.cs @@ -1,3 +1,4 @@ +using Ecommerce.Core.WebApi.Infrastructure; using Ecommerce.Core.WebApi.Swagger; using Eventuous.Spyglass; using Microsoft.AspNetCore.Http.Json; @@ -5,7 +6,6 @@ using NodaTime.Serialization.SystemTextJson; using Serilog; using ShoppingCart.Api; -using ShoppingCart.Api.Infrastructure; var builder = WebApplication.CreateBuilder(args); diff --git a/src/Retail/ShoppingCart.Api/ShoppingCart.Api.csproj b/src/Retail/ShoppingCart.Api/ShoppingCart.Api.csproj index 869ade7..08229f8 100644 --- a/src/Retail/ShoppingCart.Api/ShoppingCart.Api.csproj +++ b/src/Retail/ShoppingCart.Api/ShoppingCart.Api.csproj @@ -21,9 +21,6 @@ - - -