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

catch all errors

Browse source
This commit is contained in:
Joey Hess 2012-07-20 02:16:09 -04:00
parent d9f26115c3
commit 2fce3940b5
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/MountWatcher.hs
View file

@ -17,6 +17,7 @@ import Utility.ThreadScheduler
import Utility.Mounts import Utility.Mounts
import Control.Concurrent import Control.Concurrent
import qualified Control.Exception as E
import qualified Data.Set as S import qualified Data.Set as S
#if WITH_DBUS #if WITH_DBUS
@ -38,7 +39,7 @@ mountWatcherThread st handle =
#if WITH_DBUS #if WITH_DBUS
dbusThread :: ThreadState -> DaemonStatusHandle -> IO () dbusThread :: ThreadState -> DaemonStatusHandle -> IO ()
dbusThread st handle = (go =<< connectSession) `catchIO` onerr dbusThread st handle = E.catch (go =<< connectSession) onerr
where where
go client = ifM (checkMountMonitor client) go client = ifM (checkMountMonitor client)
( do ( do
@ -56,6 +57,7 @@ dbusThread st handle = (go =<< connectSession) `catchIO` onerr
warning "No known volume monitor available through dbus; falling back to mtab polling" warning "No known volume monitor available through dbus; falling back to mtab polling"
pollinstead pollinstead
) )
onerr :: E.SomeException -> IO ()
onerr e = do onerr e = do
runThreadState st $ runThreadState st $
warning $ "Failed to use dbus; falling back to mtab polling (" ++ show e ++ ")" warning $ "Failed to use dbus; falling back to mtab polling (" ++ show e ++ ")"