From 49070fffe0667aeb922fa11808912b64003c29bc Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Wed, 18 May 2022 18:30:06 +0100 Subject: [PATCH] make server compatible with old ini files (#372) * make server compatible with old ini files * fix * clean up --- apps/smp-server/Main.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/smp-server/Main.hs b/apps/smp-server/Main.hs index b00b266b5..86d599ad8 100644 --- a/apps/smp-server/Main.hs +++ b/apps/smp-server/Main.hs @@ -7,8 +7,9 @@ module Main where import Control.Logger.Simple +import Data.Ini (lookupValue) import Simplex.Messaging.Server (runSMPServer) -import Simplex.Messaging.Server.CLI (ServerCLIConfig (..), protocolServerCLI, readStrictIni, strictIni) +import Simplex.Messaging.Server.CLI (ServerCLIConfig (..), protocolServerCLI, readStrictIni) import Simplex.Messaging.Server.Env.STM (ServerConfig (..), defaultInactiveClientExpiration, defaultMessageExpiration) import Simplex.Messaging.Server.Expiration import Simplex.Messaging.Transport (simplexMQVersion) @@ -82,7 +83,7 @@ smpServerCLIConfig = allowNewQueues = True, messageExpiration = Just defaultMessageExpiration, inactiveClientExpiration = - if strictIni "INACTIVE_CLIENTS" "disconnect" ini == "on" + if lookupValue "INACTIVE_CLIENTS" "disconnect" ini == Right "on" then Just ExpirationConfig