summaryrefslogtreecommitdiff
path: root/src/Propellor/Message.hs
diff options
context:
space:
mode:
authorJoey Hess2017-07-30 11:30:05 -0400
committerJoey Hess2017-07-30 11:30:05 -0400
commit15f292d177ee96f5a1d384ce50f5246e3f7ea630 (patch)
tree033838d01471f633534c38e5d967264ae2dda634 /src/Propellor/Message.hs
parent497e6b4a227dc977d6bb9fe5fe73aeeca9624244 (diff)
parent6f281e87084587987929dbb6a27671ad96858535 (diff)
Merge branch 'master' into joeyconfig
Diffstat (limited to 'src/Propellor/Message.hs')
-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 441be76e..51d9babb 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,
@@ -110,7 +110,7 @@ actionMessage' mhn desc a = do
, let (msg, intensity, color) = getActionResult r
in colorLine intensity color msg
]
- liftIO $ trace $ ActionEnd $ toResult r
+ liftIO $ trace $ ActionEnd mhn desc (toResult r)
return r
where