Revision 79ac58fa htools/Ganeti/Confd/Server.hs
b/htools/Ganeti/Confd/Server.hs | ||
---|---|---|
30 | 30 |
) where |
31 | 31 |
|
32 | 32 |
import Control.Concurrent |
33 |
import Control.Exception |
|
33 | 34 |
import Control.Monad (forever) |
34 | 35 |
import qualified Data.ByteString as B |
35 | 36 |
import Data.IORef |
36 | 37 |
import Data.List |
37 | 38 |
import qualified Data.Map as M |
38 | 39 |
import qualified Network.Socket as S |
40 |
import Prelude hiding (catch) |
|
39 | 41 |
import System.Posix.Files |
40 | 42 |
import System.Posix.Types |
41 | 43 |
import System.Time |
... | ... | |
300 | 302 |
updateConfig path cref |
301 | 303 |
return (nt', ConfigReloaded) |
302 | 304 |
) (\e -> do |
303 |
let msg = "Failure during configuration update: " ++ show e |
|
305 |
let msg = "Failure during configuration update: " ++ |
|
306 |
show (e::IOError) |
|
304 | 307 |
writeIORef cref (Bad msg) |
305 | 308 |
return (nullFStat, ConfigIOError) |
306 | 309 |
) |
... | ... | |
416 | 419 |
addNotifier inotify path cref mstate = do |
417 | 420 |
catch (addWatch inotify [CloseWrite] path |
418 | 421 |
(onInotify inotify path cref mstate) >> return True) |
419 |
(const $ return False)
|
|
422 |
(\e -> const (return False) (e::IOError))
|
|
420 | 423 |
|
421 | 424 |
-- | Inotify event handler. |
422 | 425 |
onInotify :: INotify -> String -> CRef -> MVar ServerState -> Event -> IO () |
Also available in: Unified diff