From 69aa82837c743de22ea188044a6b9f36892dd4be Mon Sep 17 00:00:00 2001 From: qvalentin Date: Mon, 19 Jun 2023 19:04:53 +0200 Subject: [PATCH] Add some logging --- backend/jitsi-rooms.cabal | 4 +++- backend/package.yaml | 1 + backend/src/RoomDataHandler.hs | 2 +- backend/src/WebServer.hs | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/jitsi-rooms.cabal b/backend/jitsi-rooms.cabal index 51a353c..416656e 100644 --- a/backend/jitsi-rooms.cabal +++ b/backend/jitsi-rooms.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.35.0. +-- This file has been generated from package.yaml by hpack version 0.35.2. -- -- see: https://github.com/sol/hpack @@ -65,6 +65,7 @@ library , time , uuid , wai + , wai-extra , warp , websockets default-language: Haskell2010 @@ -91,6 +92,7 @@ executable jitsi-rooms-exe , time , uuid , wai + , wai-extra , warp , websockets default-language: Haskell2010 diff --git a/backend/package.yaml b/backend/package.yaml index 2e64954..dc41a92 100644 --- a/backend/package.yaml +++ b/backend/package.yaml @@ -33,6 +33,7 @@ dependencies: - lifted-base - mtl - time + - wai-extra ghc-options: - -Wall diff --git a/backend/src/RoomDataHandler.hs b/backend/src/RoomDataHandler.hs index e78fb1c..273846d 100644 --- a/backend/src/RoomDataHandler.hs +++ b/backend/src/RoomDataHandler.hs @@ -44,7 +44,7 @@ roomDataHandler :: m ResponseReceived roomDataHandler = do newRoomData <- parseBodyOrBadRequest - liftIO $ putStrLn "Got triggered form prosody" + liftIO $ putStrLn "Got triggered from prosody" whenM (roomStateDiffers newRoomData) $ do setRoomDataState newRoomData broadcastUserData diff --git a/backend/src/WebServer.hs b/backend/src/WebServer.hs index 1e256b9..8b572f9 100644 --- a/backend/src/WebServer.hs +++ b/backend/src/WebServer.hs @@ -15,6 +15,7 @@ import Control.Monad.Except import Network.HTTP.Types import Network.Wai import Network.Wai.Handler.Warp (run) +import Network.Wai.Middleware.RequestLogger (logStdoutDev) import RoomDataHandler (roomDataHandler) import State.ConnectedClientsState ( MonadConnectedClientsRead (..), @@ -165,5 +166,5 @@ runWebServer :: m () runWebServer = do putStrLn "http://localhost:8081/" - runWebApp >>= liftIO . run 8081 + runWebApp >>= liftIO . (run 8081 . logStdoutDev) return ()