From e36a24df176cdbbd634738115f847e4fa46a0aea Mon Sep 17 00:00:00 2001 From: Paul Oliver Date: Fri, 12 Sep 2025 01:43:15 +0000 Subject: Adds `Logs` constraint combinator --- hsm-web/Hsm/Web.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'hsm-web/Hsm/Web.hs') diff --git a/hsm-web/Hsm/Web.hs b/hsm-web/Hsm/Web.hs index b8f8881..8c0284c 100644 --- a/hsm-web/Hsm/Web.hs +++ b/hsm-web/Hsm/Web.hs @@ -20,7 +20,7 @@ import Effectful.Dispatch.Static import Effectful.Dispatch.Static.Primitive (Env) import Effectful.Exception (finally) import Hsm.Cam (Cam, capturePng) -import Hsm.Log (Log, Severity (Info, Trace), logMsg, makeLoggerIO) +import Hsm.Log (Log, Logs, Severity (Info, Trace), logMsg, makeLoggerIO) import Network.Wai.Handler.Warp (defaultSettings, setLogger) import Paths_hsm_web (getDataFileName) import Web.Scotty (Options (settings, verbose), defaultOptions, file, get, liftIO, raw, scottyOpts, setHeader) @@ -41,7 +41,7 @@ server options env = do setHeader "Content-Type" "image/png" liftIO (unEff capturePng env) >>= raw -runServer :: (Cam :> es, Log "cam" :> es, Log "web" :> es, Web :> es) => Eff es () +runServer :: (Cam :> es, Logs '["cam", "web"] es, Web :> es) => Eff es () runServer = finally startServer stopServer where startServer = do @@ -50,7 +50,7 @@ runServer = finally startServer stopServer unsafeEff $ server options stopServer = logMsg @"web" Info "Stopping scotty web server" -runWeb :: (IOE :> es, Log "scotty" :> es, Log "web" :> es) => Eff (Web : es) a -> Eff es a +runWeb :: (IOE :> es, Logs '["scotty", "web"] es) => Eff (Web : es) a -> Eff es a runWeb action = do logMsg @"web" Info "Registering logger for scotty web server" scottyLogger <- makeLoggerIO @"scotty" >>= return . logRequest -- cgit v1.2.1