From b454c14cbdf3530c69c1201164f3c97cfd37cb1a Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Tue, 29 Sep 2015 13:51:40 -0400 Subject: [PATCH] Revert "Merge pull request #16228 from duglin/ContextualizeEvents" Although having a request ID available throughout the codebase is very valuable, the impact of requiring a Context as an argument to every function in the codepath of an API request, is too significant and was not properly understood at the time of the review. Furthermore, mixing API-layer code with non-API-layer code makes the latter usable only by API-layer code (one that has a notion of Context). This reverts commit de4164043546d2b9ee3bf323dbc41f4979c84480, reversing changes made to 7daeecd42d7bb112bfe01532c8c9a962bb0c7967. Signed-off-by: Tibor Vass Conflicts: api/server/container.go builder/internals.go daemon/container_unix.go daemon/create.go --- jsonmessage/jsonmessage.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jsonmessage/jsonmessage.go b/jsonmessage/jsonmessage.go index 4620483..451c6a9 100644 --- a/jsonmessage/jsonmessage.go +++ b/jsonmessage/jsonmessage.go @@ -92,7 +92,6 @@ func (p *JSONProgress) String() string { // the created time, where it from, status, ID of the // message. It's used for docker events. type JSONMessage struct { - RequestID string `json:"reqid,omitempty"` Stream string `json:"stream,omitempty"` Status string `json:"status,omitempty"` Progress *JSONProgress `json:"progressDetail,omitempty"` @@ -128,9 +127,6 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error { } else if jm.Time != 0 { fmt.Fprintf(out, "%s ", time.Unix(jm.Time, 0).Format(timeutils.RFC3339NanoFixed)) } - if jm.RequestID != "" { - fmt.Fprintf(out, "[reqid: %s] ", jm.RequestID) - } if jm.ID != "" { fmt.Fprintf(out, "%s: ", jm.ID) }