import Control.Monad
import Control.Monad.IO.Class
import Control.Monad.Except
-#if __GLASGOW_HASKELL__ >= 806
+#if __GLASGOW_HASKELL__ == 806
import Control.Monad.Fail
#endif
import Control.Monad.Trans.Reader (ReaderT, runReaderT)
runSession' = runSession context initState
errorHandler = throwTo mainThreadId :: SessionException -> IO()
- serverLauncher = forkIO $ catch (serverHandler serverOut context) errorHandler
+ serverListenerLauncher =
+ forkIO $ catch (serverHandler serverOut context) errorHandler
server = (Just serverIn, Just serverOut, Nothing, serverProc)
- serverFinalizer tid = finally (timeout (messageTimeout config * 1000000)
+ serverAndListenerFinalizer tid =
+ finally (timeout (messageTimeout config * 1000000)
(runSession' exitServer))
- (cleanupRunningProcess server >> killThread tid)
+ (cleanupProcess server >> killThread tid)
- (result, _) <- bracket serverLauncher serverFinalizer (const $ runSession' session)
+ (result, _) <- bracket serverListenerLauncher serverAndListenerFinalizer
+ (const $ runSession' session)
return result
updateStateC :: ConduitM FromServerMessage FromServerMessage (StateT SessionState (ReaderT SessionContext IO)) ()