summaryrefslogtreecommitdiffhomepage
path: root/Role/Downloader.hs
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-04-26 14:23:37 -0400
committerJoey Hess <joeyh@joeyh.name>2017-04-26 14:23:37 -0400
commit6591e2b974ac22cbc2a06141edef76a775726e11 (patch)
tree5645836082da23127ae9bb7517c66edf539f9ef3 /Role/Downloader.hs
parente741f206be605647f360c38c5b833a2218681e20 (diff)
downloaddebug-me-6591e2b974ac22cbc2a06141edef76a775726e11.tar.gz
have server relay Devloper messages to other Developers
Diffstat (limited to 'Role/Downloader.hs')
-rw-r--r--Role/Downloader.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Role/Downloader.hs b/Role/Downloader.hs
index ede11a7..07148e8 100644
--- a/Role/Downloader.hs
+++ b/Role/Downloader.hs
@@ -7,12 +7,12 @@ import SessionID
import Control.Concurrent.STM
import Control.Concurrent.STM.TMChan
-import Role.Developer (run', processSessionStart, getUserMessage, Output(..))
+import Role.Developer (run', processSessionStart, getServerMessage, Output(..))
run :: DownloadOpts -> IO ()
run = run' downloader . downloadUrl
-downloader :: TMChan (Message Entered) -> TMChan (Message Seen) -> SessionID -> IO ()
+downloader :: TMChan (Message Entered) -> TMChan LogMessage -> SessionID -> IO ()
downloader _ichan ochan sid = do
let logfile = sessionLogFile "." sid
putStrLn $ "Starting download to " ++ logfile
@@ -22,11 +22,11 @@ downloader _ichan ochan sid = do
go logger st
where
go logger st = do
- v <- atomically $ getUserMessage ochan st
+ v <- atomically $ getServerMessage ochan st
case v of
Nothing -> return ()
Just (o, msg) -> do
- _ <- logger $ User msg
+ _ <- logger msg
case o of
ProtocolError e -> error ("Protocol error: " ++ e)
_ -> go logger st