Merge branch 'logging' of gitolite:tickLeisteServer into logging
This commit is contained in:
commit
069bf3fde8
1 changed files with 4 additions and 2 deletions
|
@ -13,9 +13,10 @@ import Control.Monad.Reader.Class(ask)
|
||||||
import Data.Aeson
|
import Data.Aeson
|
||||||
import qualified Data.Aeson.TickLeiste as TL
|
import qualified Data.Aeson.TickLeiste as TL
|
||||||
import qualified Data.ByteString as B
|
import qualified Data.ByteString as B
|
||||||
import qualified Data.ByteString.Lazy as BL
|
import qualified Data.ByteString.Lazy as BL(toStrict)
|
||||||
import qualified Data.Map.Strict as M
|
import qualified Data.Map.Strict as M
|
||||||
import Data.Maybe (maybe)
|
import Data.Maybe (maybe) -- should be replaced by either
|
||||||
|
import Data.Either (either)
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import qualified Data.Text.Encoding as T
|
import qualified Data.Text.Encoding as T
|
||||||
import qualified Data.TickLeiste as TL
|
import qualified Data.TickLeiste as TL
|
||||||
|
@ -104,6 +105,7 @@ clientLogic client sessionStateMVar = do
|
||||||
-- the next line is a bit ugly, maybe there is a better way?
|
-- the next line is a bit ugly, maybe there is a better way?
|
||||||
-- maybe refactor, so that the request Handler can choose to lock or not. -- TODO
|
-- maybe refactor, so that the request Handler can choose to lock or not. -- TODO
|
||||||
(\request -> modifyMVar_ sessionStateMVar (\sessionState -> requestHandler client sessionState request))
|
(\request -> modifyMVar_ sessionStateMVar (\sessionState -> requestHandler client sessionState request))
|
||||||
|
-- TODO maybe (hihi) a decodeEithor for better logging?
|
||||||
(decodeStrict msg :: Maybe TL.JSONRequest)
|
(decodeStrict msg :: Maybe TL.JSONRequest)
|
||||||
clientLogic client sessionStateMVar
|
clientLogic client sessionStateMVar
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue