From fa278340d5f1bc915a250bede93258a45234ba1a Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 11 Jul 2019 00:08:48 +0200 Subject: [PATCH] Add a finally and timeout to ensure the call to killThread --- src/Language/Haskell/LSP/Test/Session.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Language/Haskell/LSP/Test/Session.hs b/src/Language/Haskell/LSP/Test/Session.hs index 1777f15..21a5fe7 100644 --- a/src/Language/Haskell/LSP/Test/Session.hs +++ b/src/Language/Haskell/LSP/Test/Session.hs @@ -65,6 +65,7 @@ import Language.Haskell.LSP.Test.Exceptions import System.Console.ANSI import System.Directory import System.IO +import System.Timeout -- | A session representing one instance of launching and connecting to a server. -- @@ -216,7 +217,8 @@ runSessionWithHandles serverIn serverOut serverHandler config caps rootDir exitS errorHandler = throwTo mainThreadId :: SessionException -> IO() serverLauncher = forkIO $ catch (serverHandler serverOut context) errorHandler - serverFinalizer tid = runSession' exitServer >> killThread tid + serverFinalizer tid = finally (timeout 60000000 (runSession' exitServer)) + (killThread tid) (result, _) <- bracket serverLauncher serverFinalizer (const $ runSession' session) return result -- 2.30.2