diff options
author | 2012-06-06 16:50:28 -0400 | |
---|---|---|
committer | 2012-06-06 16:50:28 -0400 | |
commit | c5b11561f0110c70454b6123ab64ac044c81a5c3 (patch) | |
tree | 4cf94daeecb653b586b2b79e7388425fed9d6a3d /Utility/Inotify.hs | |
parent | db8effb8f3e861c61bc4c640d712688a8ed342e1 (diff) |
handle running out of watch descriptors
Diffstat (limited to 'Utility/Inotify.hs')
-rw-r--r-- | Utility/Inotify.hs | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/Utility/Inotify.hs b/Utility/Inotify.hs index 1896a2a26..b74fbd18d 100644 --- a/Utility/Inotify.hs +++ b/Utility/Inotify.hs @@ -14,6 +14,8 @@ import Utility.ThreadLock import System.INotify import qualified System.Posix.Files as Files +import System.IO.Error +import Control.Exception (throw) type Hook = Maybe (FilePath -> IO ()) @@ -45,18 +47,22 @@ type Hook = Maybe (FilePath -> IO ()) - - Note: inotify has a limit to the number of watches allowed, - /proc/sys/fs/inotify/max_user_watches (default 8192). - - So this will fail if there are too many subdirectories. + - So this will fail if there are too many subdirectories. The + - toomany hook is called when this happens. -} -watchDir :: INotify -> FilePath -> (FilePath -> Bool) -> Hook -> Hook -> Hook -> Hook -> IO () -watchDir i dir ignored add addsymlink del deldir = unless (ignored dir) $ do - lock <- newLock - void $ addWatch i watchevents dir $ \event -> - withLock lock (void $ go event) - withLock lock $ - mapM_ walk =<< filter (not . dirCruft) <$> - getDirectoryContents dir +watchDir :: INotify -> FilePath -> (FilePath -> Bool) -> Hook -> Hook -> Hook -> Hook -> Hook -> IO () +watchDir i dir ignored toomany add addsymlink del deldir + | ignored dir = noop + | otherwise = do + lock <- newLock + let handler event = withLock lock (void $ go event) + void (addWatch i watchevents dir handler) + `catchIO` failedaddwatch + withLock lock $ + mapM_ walk =<< filter (not . dirCruft) <$> + getDirectoryContents dir where - recurse d = watchDir i d ignored add addsymlink del deldir + recurse d = watchDir i d ignored toomany add addsymlink del deldir -- Select only inotify events required by the enabled -- hooks, but always include Create so new directories can @@ -116,3 +122,12 @@ watchDir i dir ignored add addsymlink del deldir = unless (ignored dir) $ do indir f = dir </> f filetype t f = catchBoolIO $ t <$> getSymbolicLinkStatus (indir f) + + -- Inotify fails when there are too many watches with a + -- disk full error. + failedaddwatch e + | isFullError e = + case toomany of + Nothing -> throw e + Just hook -> hook dir + | otherwise = throw e |