@@ -104,7 +104,7 @@ import Data.Foldable (forM_)
104104import Data.Typeable (Typeable)
105105import Control.Applicative ((<$>))
106106import Control.Exception (throw)
107−import Control.Monad (forever, forM, replicateM, when, replicateM_)
107+import Control.Monad (forever, replicateM, replicateM_)
108108import Control.Monad.IO.Class (liftIO)
109109import Control.Concurrent (forkIO, threadDelay, ThreadId)
110110import Control.Concurrent.MVar (MVar, newMVar, readMVar, modifyMVar_)
@@ -116,17 +116,13 @@ import Control.Distributed.Process
116116 , WhereIsReply(..)
117117 , whereis
118118 , whereisRemoteAsync
119− , registerRemoteAsync
120− , reregisterRemoteAsync
121119 , getSelfPid
122120 , register
123121 , reregister
124122 , expect
125123 , nsendRemote
126124 , receiveWait
127− , receiveTimeout
128125 , match
129− , matchIf
130126 , processNodeId
131127 , monitorNode
132128 , monitor
@@ -138,7 +134,6 @@ import Control.Distributed.Process
138134 , receiveChan
139135 , nsend
140136 , SendPort
141− , RegisterReply(..)
142137 , bracket
143138 , try
144139 , send
@@ -180,21 +175,21 @@ data BackendState = BackendState {
180175initializeBackend :: N.HostName -> N.ServiceName -> RemoteTable -> IO Backend
181176initializeBackend host port rtable = do
182177 mTransport <- NT.createTransport host port NT.defaultTCPParameters
183− (recv, send) <- initMulticast "224.0.0.99" 9999 1024
178+ (recv, sendp) <- initMulticast "224.0.0.99" 9999 1024
184179 (_, backendState) <- fixIO $ \ ~(tid, _) -> do
185180 backendState <- newMVar BackendState
186181 { _localNodes = []
187182 , _peers = Set.empty
188183 , discoveryDaemon = tid
189184 }
190− tid' <- forkIO $ peerDiscoveryDaemon backendState recv send
185+ tid' <- forkIO $ peerDiscoveryDaemon backendState recv sendp
191186 return (tid', backendState)
192187 case mTransport of
193188 Left err -> throw err
194189 Right transport ->
195190 let backend = Backend {
196191 newLocalNode = apiNewLocalNode transport rtable backendState
197− , findPeers = apiFindPeers send backendState
192+ , findPeers = apiFindPeers sendp backendState
198193 , redirectLogsHere = apiRedirectLogsHere backend
199194 }
200195 in return backend
@@ -214,8 +209,8 @@ apiFindPeers :: (PeerDiscoveryMsg -> IO ())
214209 -> MVar BackendState
215210 -> Int
216211 -> IO [NodeId]
217−apiFindPeers send backendState delay = do
218− send PeerDiscoveryRequest
212+apiFindPeers sendfn backendState delay = do
213+ sendfn PeerDiscoveryRequest
219214 threadDelay delay
220215 Set.toList . (^. peers) <$> readMVar backendState
221216
@@ -238,14 +233,14 @@ peerDiscoveryDaemon :: MVar BackendState
238233 -> IO (PeerDiscoveryMsg, N.SockAddr)
239234 -> (PeerDiscoveryMsg -> IO ())
240235 -> IO ()
241−peerDiscoveryDaemon backendState recv send = forever go
236+peerDiscoveryDaemon backendState recv sendfn = forever go
242237 where
243238 go = do
244239 (msg, _) <- recv
245240 case msg of
246241 PeerDiscoveryRequest -> do
247242 nodes <- (^. localNodes) <$> readMVar backendState
248− forM_ nodes $ send . PeerDiscoveryReply . Node.localNodeId
243+ forM_ nodes $ sendfn . PeerDiscoveryReply . Node.localNodeId
249244 PeerDiscoveryReply nid ->
250245 modifyMVar_ backendState $ return . (peers ^: Set.insert nid)
251246
@@ -272,8 +267,8 @@ apiRedirectLogsHere _backend slavecontrollers = do
272267 -- Wait for the replies
273268 replicateM_ (length slavecontrollers) $ do
274269 receiveWait
275− [ match (\(RedirectLogsReply from ok) -> return ())
276− , match (\m@(NodeMonitorNotification {}) -> return ())
270+ [ match (\(RedirectLogsReply {}) -> return ())
271+ , match (\(NodeMonitorNotification {}) -> return ())
277272 ]
278273
279274--------------------------------------------------------------------------------
@@ -335,8 +330,8 @@ slaveController = do
335330 ok <- case (r :: Either ProcessRegistrationException ()) of
336331 Right _ -> return True
337332 Left _ -> do
338− r <- try (register "logger" loggerPid)
339− case (r :: Either ProcessRegistrationException ()) of
333+ s <- try (register "logger" loggerPid)
334+ case (s :: Either ProcessRegistrationException ()) of
340335 Right _ -> return True
341336 Left _ -> return False
342337 pid <- getSelfPid
@@ -359,7 +354,7 @@ findSlaves backend = do
359354 $ \_ -> do
360355
361356 -- fire off whereis requests
362− forM nodes $ \nid -> whereisRemoteAsync nid "slaveController"
357+ forM_ nodes $ \nid -> whereisRemoteAsync nid "slaveController"
363358
364359 -- Wait for the replies
365360 catMaybes <$> replicateM (length nodes) (