Revert "Fix line delimited JSON response"

This reverts commit d2f75a3. Conflicts: integration-cli/docker_api_events_test.go Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <[email protected]> (github: jfrazelle)
genana · Oct 9, 2014 · b66ac6a · b66ac6a
1 parent 4c6b7cd
commit b66ac6a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 65 deletions.
diff --git a/api/client/utils.go b/api/client/utils.go
@@ -168,7 +168,7 @@ func (cli *DockerCli) streamHelper(method, path string, setRawTerminal bool, in
 	}
 
 	if api.MatchesContentType(resp.Header.Get("Content-Type"), "application/json") {
-		return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.terminalFd, cli.isTerminal)
+		return utils.DisplayJSONMessagesStream(resp.Body, stdout, cli.outFd, cli.isTerminalOut)
 	}
 	if stdout != nil || stderr != nil {
 		// When TTY is ON, use regular copy

diff --git a/api/server/server.go b/api/server/server.go
@@ -297,8 +297,6 @@ func getEvents(eng *engine.Engine, version version.Version, w http.ResponseWrite
 	}
 
 	var job = eng.Job("events")
-	// lineDelimited JSON events was added #7047
-	job.SetenvBool("lineDelim", version.GreaterThanOrEqualTo("1.15"))
 	streamJSON(job, w, true)
 	job.Setenv("since", r.Form.Get("since"))
 	job.Setenv("until", r.Form.Get("until"))

diff --git a/events/events.go b/events/events.go
@@ -101,11 +101,6 @@ func writeEvent(job *engine.Job, event *utils.JSONMessage) error {
 	// When sending an event JSON serialization errors are ignored, but all
 	// other errors lead to the eviction of the listener.
 	if b, err := json.Marshal(event); err == nil {
-
-		if job.GetenvBool("lineDelim") {
-			b = append(b, []byte("\r\n")...)
-		}
-
 		if _, err = job.Stdout.Write(b); err != nil {
 			return err
 		}

diff --git a/integration-cli/docker_api_events_test.go b/integration-cli/docker_api_events_test.go