Revert "Merge pull request #5708 from ipfs/fix/log-ndjson"
This reverts commit f0bf99361e0aae6a69f14246b264eec21d91a32e, reversing changes made to d5c8fa50c897a8076d56bf0d87e92612becf6e65. License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Nov 2, 2018 at 18:12 UTC
5c5b03ea313c34e3f11feb2424e21028035e2d12
1 file changed
+4
-20
core/commands/log.go
+4
-20
@@ -2,7 +2,6 @@ package commands
2
3
import (
4
"bytes"
5
- "encoding/json"
5
"fmt"
6
"io"
7
@@ -104,28 +103,13 @@ Outputs event log messages (not other log messages) as they are generated.
103
104
Run: func(req cmds.Request, res cmds.Response) {
105
ctx := req.Context()
107
- r1, w1 := io.Pipe()
108
- r2, w2 := io.Pipe()
106
+ r, w := io.Pipe()
107
go func() {
110
- defer w1.Close()
108
+ defer w.Close()
109
<-ctx.Done()
110
}()
113
- // Reformat the logs as ndjson
114
- // TODO: remove this: #5709
115
- go func() {
116
- defer w2.Close()
117
- decoder := json.NewDecoder(r1)
118
- encoder := json.NewEncoder(w2)
119
- for {
120
- var obj interface{}
121
- if decoder.Decode(&obj) != nil || encoder.Encode(obj) != nil {
122
- return
123
- }
124
- }
125
- }()
126
-
127
- lwriter.WriterGroup.AddWriter(w1)
128
- res.SetOutput(r2)
111
+ lwriter.WriterGroup.AddWriter(w)
112
+ res.SetOutput(r)
113
},
114
}
115