mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid ugly error about MVar if the sqlite worker thread crashes

Browse source
This commit is contained in:
Joey Hess 2015-10-12 13:00:22 -04:00
parent fa9333e99f
commit 5072c62932
Failed to extract signature
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Database/Handle.hs
View file

@ -137,7 +137,8 @@ queryDb (DbHandle _ jobs _) a = do
res <- newEmptyMVar res <- newEmptyMVar
putMVar jobs $ QueryJob $ putMVar jobs $ QueryJob $
liftIO . putMVar res =<< tryNonAsync a liftIO . putMVar res =<< tryNonAsync a
either throwIO return =<< takeMVar res (either throwIO return =<< takeMVar res)
`catchNonAsync` (const $ error "sqlite query crashed")
closeDb :: DbHandle -> IO () closeDb :: DbHandle -> IO ()
closeDb h@(DbHandle worker jobs _) = do closeDb h@(DbHandle worker jobs _) = do