diff --git a/EnvTester/EnvTester/.env b/EnvTester/EnvTester/.env new file mode 100644 index 0000000..bbe25c6 --- /dev/null +++ b/EnvTester/EnvTester/.env @@ -0,0 +1 @@ +nummer4=TEST \ No newline at end of file diff --git a/EnvTester/EnvTester/EnvTester.csproj b/EnvTester/EnvTester/EnvTester.csproj index 8c57638..d37808c 100644 --- a/EnvTester/EnvTester/EnvTester.csproj +++ b/EnvTester/EnvTester/EnvTester.csproj @@ -9,7 +9,7 @@ - ..\..\..\EonaCat.Env\EonaCat.Env\bin\Debug\netstandard2.1\EonaCat.Env.dll + ..\..\..\EonaCat.Env\EonaCat.Env\bin\Debug\net6.0\EonaCat.Env.dll diff --git a/EnvTester/EnvTester/Program.cs b/EnvTester/EnvTester/Program.cs index 4ee5a33..7121b07 100644 --- a/EnvTester/EnvTester/Program.cs +++ b/EnvTester/EnvTester/Program.cs @@ -1,13 +1,32 @@ // See https://aka.ms/new-console-template for more information using EonaCat.Env; using EonaCat.Env.Helpers; +using System.Diagnostics.Metrics; Console.WriteLine("Hello, World!"); -Env.LoadIntoEnvironment(); +Env.LoadIntoEnvironment(new Settings(traverseDirectories:true)); var test = Env.Read(new Settings(traverseDirectories:true)); Getter.SwallowExceptions = false; -Console.WriteLine(Environment.GetEnvironmentVariable("nummer4")); -Console.WriteLine(Getter.GetString("nummer4")); +if (test.Any()) +Console.WriteLine("From Env.Read: " + test.Values); +Console.WriteLine("From Environment variable: " + Environment.GetEnvironmentVariable("nummer4")); +Console.WriteLine("From Getter: " + Getter.GetValue("nummer4")); +Console.WriteLine("From SecretManager class: " + Secrets.API_KEY); Console.WriteLine("+------+"); Console.WriteLine(Environment.GetEnvironmentVariable("FAAL")); -Console.WriteLine("test"); \ No newline at end of file +Console.WriteLine("test"); + +public static class Secrets +{ + static Secrets() + { + Env.LoadIntoEnvironment(new Settings(traverseDirectories: true)); + } + + public static string API_KEY => GetApiKey(); + + private static string GetApiKey() + { + return Getter.GetValue("nummer4"); + } +} \ No newline at end of file diff --git a/EonaCat.Logger.Web/EonaCat.Logger.Web/EonaCat.Logger.Web.csproj b/EonaCat.Logger.Web/EonaCat.Logger.Web/EonaCat.Logger.Web.csproj index 70a1dc2..ef2530f 100644 --- a/EonaCat.Logger.Web/EonaCat.Logger.Web/EonaCat.Logger.Web.csproj +++ b/EonaCat.Logger.Web/EonaCat.Logger.Web/EonaCat.Logger.Web.csproj @@ -7,6 +7,7 @@ + @@ -15,10 +16,4 @@ - - - ..\..\..\EonaCat.Logger\EonaCat.Logger\bin\Debug\netstandard2.0\EonaCat.Logger.dll - - - diff --git a/EonaCat.Logger.Web/EonaCat.Logger.Web/Program.cs b/EonaCat.Logger.Web/EonaCat.Logger.Web/Program.cs index eb03bf0..649c037 100644 --- a/EonaCat.Logger.Web/EonaCat.Logger.Web/Program.cs +++ b/EonaCat.Logger.Web/EonaCat.Logger.Web/Program.cs @@ -1,3 +1,5 @@ +using EonaCat.Logger; +using EonaCat.Logger.Extensions; using EonaCat.Logger.Managers; using EonaCat.Web.RateLimiter; using EonaCat.Web.RateLimiter.Endpoints.Extensions; @@ -7,10 +9,10 @@ using Microsoft.AspNetCore.Builder; var builder = WebApplication.CreateBuilder(args); // Add services to the container. -//FileLoggerOptions options = new FileLoggerOptions(); -//options.MaxRolloverFiles = 5; -//options.FileSizeLimit = 1 * 1024 * 1024 / 4; -//builder.Logging.AddEonaCatFileLogger(fileLoggerOptions: options, filenamePrefix:"web"); +FileLoggerOptions options = new FileLoggerOptions(); +options.MaxRolloverFiles = 5; +options.FileSizeLimit = 1 * 1024 * 1024 / 4; +builder.Logging.AddEonaCatFileLogger(fileLoggerOptions: options, filenamePrefix:"web"); builder.Services.AddRazorPages(); @@ -21,12 +23,12 @@ builder.Services.AddRazorPages(); //}; //builder.Services.AddRateLimiting(rateLimitOptions); -var options = new RateLimiterOptions(); -options.OutputLimitMessageAsHtml = false; -options.OutputLimitMessageAsXml = false; -options.OutputLimitMessageAsJson = true; +var rateOptions = new RateLimiterOptions(); +rateOptions.OutputLimitMessageAsHtml = false; +rateOptions.OutputLimitMessageAsXml = false; +rateOptions.OutputLimitMessageAsJson = true; -options.AddDefaultConfiguration(config => +rateOptions.AddDefaultConfiguration(config => config.AddIpResolver().AddRule(3, TimeSpan.FromSeconds(10)) ); @@ -36,12 +38,12 @@ async void RateLimiterMiddleware_OnLimitResponseCreatedAsync(object? sender, Htt await httpContext.Response.WriteAsync(" THIS IS MY CUSTOM RATE LIMIT MESSAGE"); } -//builder.Services.UseWebRateLimiter(options); -builder.Services.UseWebRateLimiter(options); -builder.Services.UseWebRateLimiter(options => +//builder.Services.UseWebRateLimiter(rateOptions); +builder.Services.UseWebRateLimiter(rateOptions); +builder.Services.UseWebRateLimiter(rateOptions => { // Configures the default rateLimitConfiguration - options.AddDefaultConfiguration(rateLimitConfiguration => + rateOptions.AddDefaultConfiguration(rateLimitConfiguration => { // throttling is based on request ip rateLimitConfiguration.AddIpResolver()