diff options
author | Joey Hess <joey@kitenet.net> | 2014-04-20 15:30:39 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-04-20 15:30:39 -0400 |
commit | 619919bd49c342de60a63f16c835f0dd4acb9acb (patch) | |
tree | 534dc7c2f2a9bd53cf155b5bfaa9e14af1f64c0b /Assistant | |
parent | 7ed6a5520cee91fc9ccd6105e938a3dd7b88dca0 (diff) |
send remote-daemon a RELOAD after making a ssh remote
This doesn't work yet, because RELOAD is buggy and does not notice the new
remote.
Diffstat (limited to 'Assistant')
-rw-r--r-- | Assistant/Threads/RemoteControl.hs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Assistant/Threads/RemoteControl.hs b/Assistant/Threads/RemoteControl.hs index a886caeb9..317efe412 100644 --- a/Assistant/Threads/RemoteControl.hs +++ b/Assistant/Threads/RemoteControl.hs @@ -52,10 +52,12 @@ remoteControlThread = namedThread "RemoteControl" $ do remoteControllerThread :: Handle -> Assistant () remoteControllerThread toh = do clicker <- getAssistant remoteControl - liftIO $ forever $ do - msg <- readChan clicker - hPutStrLn toh $ unwords $ formatMessage msg - hFlush toh + forever $ do + msg <- liftIO $ readChan clicker + debug [show msg] + liftIO $ do + hPutStrLn toh $ unwords $ formatMessage msg + hFlush toh -- read status messages emitted by the remotedaemon and handle them remoteResponderThread :: Handle -> MVar (M.Map URI Remote) -> Assistant () @@ -63,6 +65,7 @@ remoteResponderThread fromh urimap = go M.empty where go syncalerts = do l <- liftIO $ hGetLine fromh + debug [l] case parseMessage l of Just (CONNECTED uri) -> changeconnected S.insert uri Just (DISCONNECTED uri) -> changeconnected S.delete uri |