diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-07-29 17:24:24 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-07-29 17:24:24 -0400 |
| commit | 236ba63c7eece6adccae589fc0acc1425918d4eb (patch) | |
| tree | 875e512ea2a8c55c0feb69638993ec9a1d4a5247 | |
| parent | 6bc56f1c8383910c89fe80bb668854a7d5e8c0e2 (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.
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/Propellor/Message.hs | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 5c9cddd2..188c34c6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +propellor (4.7.3) UNRELEASED; urgency=medium + + * Expand the Trace data type. + + -- Joey Hess <id@joeyh.name> Sat, 29 Jul 2017 17:23:44 -0400 + propellor (4.7.2) unstable; urgency=medium * Added PROPELLOR_TRACE environment variable, which can be set to 1 to 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 $ |