From 0b69bc760f87efab73ca6efb454b30a3393be269 Mon Sep 17 00:00:00 2001 From: vnugent Date: Sun, 4 Aug 2024 15:36:26 -0400 Subject: consolidate log config --- apps/VNLib.WebServer/src/VirtualHosts/JsonWebConfigBuilder.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'apps/VNLib.WebServer/src/VirtualHosts') diff --git a/apps/VNLib.WebServer/src/VirtualHosts/JsonWebConfigBuilder.cs b/apps/VNLib.WebServer/src/VirtualHosts/JsonWebConfigBuilder.cs index 820664c..7f3b488 100644 --- a/apps/VNLib.WebServer/src/VirtualHosts/JsonWebConfigBuilder.cs +++ b/apps/VNLib.WebServer/src/VirtualHosts/JsonWebConfigBuilder.cs @@ -40,7 +40,7 @@ using VNLib.WebServer.Config.Model; namespace VNLib.WebServer { - internal sealed partial class JsonWebConfigBuilder(VirtualHostServerConfig VhConfig, TimeSpan execTimeout, ILogProvider logger) + internal sealed partial class JsonWebConfigBuilder(VirtualHostServerConfig VhConfig, ILogProvider logger) : IVirtualHostConfigBuilder { //Use pre-compiled default regex @@ -55,7 +55,7 @@ namespace VNLib.WebServer //File root is required RootDir = new(VhConfig.DirPath!), LogProvider = logger, - ExecutionTimeout = execTimeout, + ExecutionTimeout = GetExecutionTimeout(VhConfig), WhiteList = GetIpWhitelist(VhConfig), DownStreamServers = GetDownStreamServers(VhConfig), ExcludedExtensions = GetExlcudedExtensions(VhConfig), @@ -170,6 +170,12 @@ namespace VNLib.WebServer return (downstreamServers ?? []).ToFrozenSet(); } + private static TimeSpan GetExecutionTimeout(VirtualHostServerConfig conf) + { + //Get the execution timeout + return TimeSpan.FromMilliseconds(conf.MaxExecutionTimeMs); + } + private static FrozenSet? GetIpWhitelist(VirtualHostServerConfig conf) { if(conf.Whitelist is null) -- cgit