remove uses of warningIO
It's not concurrent-output safe, and doesn't support --json-error-messages. Using Annex.makeRunner is a bit scary, because what if it's run in a different thread from an active annex action? Normally the same Annex state is not used concurrently in several threads, and it's not designed to be fully concurrency safe. (Annex.Concurrent exists to deal with that.) I think it will be ok in these simple cases though. Eg, when buffering a warning message to json, Annex.changeState is used, and it modifies the MVar in a concurrency safe way. The only warningIO remaining is not a problem.
This commit is contained in:
parent
1858b65d88
commit
63839532c9
5 changed files with 28 additions and 22 deletions
|
@ -85,8 +85,8 @@ storeChunks key tmp dest storer recorder finalizer = do
|
|||
- But this is the best that can be done with the storer interface that
|
||||
- writes a whole L.ByteString at a time.
|
||||
-}
|
||||
storeChunked :: ChunkSize -> [FilePath] -> (FilePath -> L.ByteString -> IO ()) -> L.ByteString -> IO [FilePath]
|
||||
storeChunked chunksize dests storer content =
|
||||
storeChunked :: (Annex () -> IO ()) -> ChunkSize -> [FilePath] -> (FilePath -> L.ByteString -> IO ()) -> L.ByteString -> IO [FilePath]
|
||||
storeChunked annexrunner chunksize dests storer content =
|
||||
either onerr return =<< tryNonAsync (go (Just chunksize) dests)
|
||||
where
|
||||
go _ [] = return [] -- no dests!?
|
||||
|
@ -99,7 +99,7 @@ storeChunked chunksize dests storer content =
|
|||
| otherwise = storechunks sz [] dests content
|
||||
|
||||
onerr e = do
|
||||
warningIO (show e)
|
||||
annexrunner $ warning (show e)
|
||||
return []
|
||||
|
||||
storechunks _ _ [] _ = return [] -- ran out of dests
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue