From d1f722e3b0b74a9d9a2e35ac1f47dbca9f7cf606 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 9 Sep 2016 15:49:44 -0400 Subject: better locking for json with -J Avoid threads emitting json at the same time and scrambling, which was still possible even with the buffering, just less likely. Converted json IO actions to JSONChunk data too. --- Messages.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Messages.hs') diff --git a/Messages.hs b/Messages.hs index 38b8ad890..53f356c1d 100644 --- a/Messages.hs +++ b/Messages.hs @@ -85,7 +85,7 @@ showSideAction m = Annex.getState Annex.output >>= go Annex.changeState $ \s -> s { Annex.output = st' } | sideActionBlock st == InBlock = return () | otherwise = p - p = outputMessage q $ "(" ++ m ++ "...)\n" + p = outputMessage JSON.none $ "(" ++ m ++ "...)\n" showStoringStateAction :: Annex () showStoringStateAction = showSideAction "recording state in git" @@ -110,7 +110,7 @@ doSideAction' b a = do {- Make way for subsequent output of a command. -} showOutput :: Annex () showOutput = unlessM commandProgressDisabled $ - outputMessage q "\n" + outputMessage JSON.none "\n" showLongNote :: String -> Annex () showLongNote s = outputMessage (JSON.note s) ('\n' : indent s ++ "\n") @@ -140,7 +140,7 @@ earlyWarning = warning' False warning' :: Bool -> String -> Annex () warning' makeway w = do when makeway $ - outputMessage q "\n" + outputMessage JSON.none "\n" outputError (w ++ "\n") {- Not concurrent output safe. -} @@ -173,10 +173,10 @@ showCustom command a = do outputMessage (JSON.end r) "" showHeader :: String -> Annex () -showHeader h = outputMessage q $ (h ++ ": ") +showHeader h = outputMessage JSON.none $ (h ++ ": ") showRaw :: String -> Annex () -showRaw s = outputMessage q (s ++ "\n") +showRaw s = outputMessage JSON.none (s ++ "\n") setupConsole :: IO () setupConsole = do -- cgit v1.2.3