From eed46f049e498dc67c4c4a85092fee9f6beb292e Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Fri, 2 Nov 2018 17:17:48 -0700 Subject: [PATCH] Revert "Merge pull request #5708 from ipfs/fix/log-ndjson" This reverts commit f0bf99361e0aae6a69f14246b264eec21d91a32e, reversing changes made to d5c8fa50c897a8076d56bf0d87e92612becf6e65. No longer necessary now that we've updated go-log. License: MIT Signed-off-by: Steven Allen --- core/commands/log.go | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/core/commands/log.go b/core/commands/log.go index aea087454a2..83c54375c84 100644 --- a/core/commands/log.go +++ b/core/commands/log.go @@ -2,7 +2,6 @@ package commands import ( "bytes" - "encoding/json" "fmt" "io" @@ -104,28 +103,13 @@ Outputs event log messages (not other log messages) as they are generated. Run: func(req cmds.Request, res cmds.Response) { ctx := req.Context() - r1, w1 := io.Pipe() - r2, w2 := io.Pipe() + r, w := io.Pipe() go func() { - defer w1.Close() + defer w.Close() <-ctx.Done() }() - // Reformat the logs as ndjson - // TODO: remove this: #5709 - go func() { - defer w2.Close() - decoder := json.NewDecoder(r1) - encoder := json.NewEncoder(w2) - for { - var obj interface{} - if decoder.Decode(&obj) != nil || encoder.Encode(obj) != nil { - return - } - } - }() - - lwriter.WriterGroup.AddWriter(w1) - res.SetOutput(r2) + lwriter.WriterGroup.AddWriter(w) + res.SetOutput(r) }, }