summaryrefslogtreecommitdiff
path: root/src/Propellor
diff options
context:
space:
mode:
authorJoey Hess2017-07-29 17:24:24 -0400
committerJoey Hess2017-07-29 17:24:24 -0400
commit236ba63c7eece6adccae589fc0acc1425918d4eb (patch)
tree875e512ea2a8c55c0feb69638993ec9a1d4a5247 /src/Propellor
parent6bc56f1c8383910c89fe80bb668854a7d5e8c0e2 (diff)
Expand the Trace data type.
Technically this is an API change, but the only thing I'm breaking at this point is my own unreleased software.
Diffstat (limited to 'src/Propellor')
-rw-r--r--src/Propellor/Message.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs
index 690056e4..435a12b2 100644
--- a/src/Propellor/Message.hs
+++ b/src/Propellor/Message.hs
@@ -42,7 +42,7 @@ import Utility.PartialPrelude
-- make propellor emit these to stdout, in addition to its other output.
data Trace
= ActionStart (Maybe HostName) Desc
- | ActionEnd Result
+ | ActionEnd (Maybe HostName) Desc Result
deriving (Read, Show)
-- | Given a line read from propellor, if it's a serialized Trace,
@@ -101,7 +101,7 @@ actionMessage' mhn desc a = do
liftIO $ trace $ ActionStart mhn desc
r <- a
- liftIO $ trace $ ActionEnd $ toResult r
+ liftIO $ trace $ ActionEnd mhn desc (toResult r)
liftIO $ outputConcurrent . concat =<< sequence
[ whenConsole $