Merge pull request flynn#952 from flynn/attach-client-exit-code

jvatic · jvatic · commit abe86f250023 · 2015-02-03T17:56:41.000-08:00
pkg/cluster,controller,dashboard: Return -1 from attach client if exit code unknown
diff --git a/controller/jobs.go b/controller/jobs.go
@@ -279,8 +279,11 @@ func (c *controllerAPI) JobLog(ctx context.Context, w http.ResponseWriter, req *
 			return
 		}
 		if tail {
-			ch <- &sseLogChunk{Event: "exit", Data: []byte(fmt.Sprintf(`{"status": %d}`, exit))}
-			return
+			// Send eof if we don't know the exit code
+			if exit != -1 {
+				ch <- &sseLogChunk{Event: "exit", Data: []byte(fmt.Sprintf(`{"status": %d}`, exit))}
+				return
+			}
 		}
 		ch <- &sseLogChunk{Event: "eof"}
 	} else {
diff --git a/dashboard/app/lib/javascripts/dashboard/stores/app-jobs.js b/dashboard/app/lib/javascripts/dashboard/stores/app-jobs.js
@@ -35,7 +35,7 @@ var AppJobs = Dashboard.Stores.AppJobs = Dashboard.Store.createClass({
 		if (event.name === "JOB_EXIT") {
 			var hasChanges = false;
 			this.state.processes.forEach(function (process) {
-				if (process.id === event.jobId) {
+				if (process.id === event.jobId && event.status !== undefined) {
 					hasChanges = true;
 					process.state = event.status === 0 ? "down" : "crashed";
 				}
diff --git a/pkg/cluster/attach.go b/pkg/cluster/attach.go
@@ -136,7 +136,7 @@ func (c *attachClient) Wait() error {
 func (c *attachClient) Receive(stdout, stderr io.Writer) (int, error) {
 	if c.wait != nil {
 		if err := c.wait(); err != nil {
-			return 0, err
+			return -1, err
 		}
 		c.mtx.Unlock()
 	}
@@ -148,55 +148,55 @@ func (c *attachClient) Receive(stdout, stderr io.Writer) (int, error) {
 			if err == io.EOF && stdout == nil && stderr == nil {
 				err = nil
 			}
-			return 0, err
+			return -1, err
 		}
 		switch frameType {
 		case host.AttachData:
 			stream, err := r.ReadByte()
 			if err != nil {
-				return 0, err
+				return -1, err
 			}
 			var out *io.Writer
 			switch stream {
 			case 1:
 				if stdout == nil {
-					return 0, errors.New("attach: got frame for stdout, but no writer available")
+					return -1, errors.New("attach: got frame for stdout, but no writer available")
 				}
 				out = &stdout
 			case 2:
 				if stderr == nil {
-					return 0, errors.New("attach: got frame for stderr, but no writer available")
+					return -1, errors.New("attach: got frame for stderr, but no writer available")
 				}
 				out = &stderr
 			default:
-				return 0, fmt.Errorf("attach: unknown stream %d", stream)
+				return -1, fmt.Errorf("attach: unknown stream %d", stream)
 			}
 			if _, err := io.ReadFull(r, buf[:]); err != nil {
-				return 0, err
+				return -1, err
 			}
 			length := int64(binary.BigEndian.Uint32(buf[:]))
 			if length == 0 {
 				*out = nil
 				continue
 			}
 			if _, err := io.CopyN(*out, r, length); err != nil {
-				return 0, err
+				return -1, err
 			}
 		case host.AttachExit:
 			if _, err := io.ReadFull(r, buf[:]); err != nil {
-				return 0, err
+				return -1, err
 			}
 			return int(binary.BigEndian.Uint32(buf[:])), nil
 		case host.AttachError:
 			if _, err := io.ReadFull(r, buf[:]); err != nil {
-				return 0, err
+				return -1, err
 			}
 			length := int64(binary.BigEndian.Uint32(buf[:]))
 			errBytes := make([]byte, length)
 			if _, err := io.ReadFull(r, errBytes); err != nil {
-				return 0, err
+				return -1, err
 			}
-			return 0, errors.New(string(errBytes))
+			return -1, errors.New(string(errBytes))
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -279,8 +279,11 @@ func (c controllerAPI) JobLog(ctx context.Context, w http.ResponseWriter, req `
`279`	`279`	`return`
`280`	`280`	`}`
`281`	`281`	`if tail {`
`282`		- ch <- &sseLogChunk{Event: "exit", Data: []byte(fmt.Sprintf(`{"status": %d}`, exit))}
`283`		`- return`
	`282`	`+ // Send eof if we don't know the exit code`
	`283`	`+ if exit != -1 {`
	`284`	+ ch <- &sseLogChunk{Event: "exit", Data: []byte(fmt.Sprintf(`{"status": %d}`, exit))}
	`285`	`+ return`
	`286`	`+ }`
`284`	`287`	`}`
`285`	`288`	`ch <- &sseLogChunk{Event: "eof"}`
`286`	`289`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ var AppJobs = Dashboard.Stores.AppJobs = Dashboard.Store.createClass({`
`35`	`35`	`if (event.name === "JOB_EXIT") {`
`36`	`36`	`var hasChanges = false;`
`37`	`37`	`this.state.processes.forEach(function (process) {`
`38`		`- if (process.id === event.jobId) {`
	`38`	`+ if (process.id === event.jobId && event.status !== undefined) {`
`39`	`39`	`hasChanges = true;`
`40`	`40`	`process.state = event.status === 0 ? "down" : "crashed";`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func (c *attachClient) Wait() error {`
`136`	`136`	`func (c *attachClient) Receive(stdout, stderr io.Writer) (int, error) {`
`137`	`137`	`if c.wait != nil {`
`138`	`138`	`if err := c.wait(); err != nil {`
`139`		`- return 0, err`
	`139`	`+ return -1, err`
`140`	`140`	`}`
`141`	`141`	`c.mtx.Unlock()`
`142`	`142`	`}`
`@@ -148,55 +148,55 @@ func (c *attachClient) Receive(stdout, stderr io.Writer) (int, error) {`
`148`	`148`	`if err == io.EOF && stdout == nil && stderr == nil {`
`149`	`149`	`err = nil`
`150`	`150`	`}`
`151`		`- return 0, err`
	`151`	`+ return -1, err`
`152`	`152`	`}`
`153`	`153`	`switch frameType {`
`154`	`154`	`case host.AttachData:`
`155`	`155`	`stream, err := r.ReadByte()`
`156`	`156`	`if err != nil {`
`157`		`- return 0, err`
	`157`	`+ return -1, err`
`158`	`158`	`}`
`159`	`159`	`var out *io.Writer`
`160`	`160`	`switch stream {`
`161`	`161`	`case 1:`
`162`	`162`	`if stdout == nil {`
`163`		`- return 0, errors.New("attach: got frame for stdout, but no writer available")`
	`163`	`+ return -1, errors.New("attach: got frame for stdout, but no writer available")`
`164`	`164`	`}`
`165`	`165`	`out = &stdout`
`166`	`166`	`case 2:`
`167`	`167`	`if stderr == nil {`
`168`		`- return 0, errors.New("attach: got frame for stderr, but no writer available")`
	`168`	`+ return -1, errors.New("attach: got frame for stderr, but no writer available")`
`169`	`169`	`}`
`170`	`170`	`out = &stderr`
`171`	`171`	`default:`
`172`		`- return 0, fmt.Errorf("attach: unknown stream %d", stream)`
	`172`	`+ return -1, fmt.Errorf("attach: unknown stream %d", stream)`
`173`	`173`	`}`
`174`	`174`	`if _, err := io.ReadFull(r, buf[:]); err != nil {`
`175`		`- return 0, err`
	`175`	`+ return -1, err`
`176`	`176`	`}`
`177`	`177`	`length := int64(binary.BigEndian.Uint32(buf[:]))`
`178`	`178`	`if length == 0 {`
`179`	`179`	`*out = nil`
`180`	`180`	`continue`
`181`	`181`	`}`
`182`	`182`	`if _, err := io.CopyN(*out, r, length); err != nil {`
`183`		`- return 0, err`
	`183`	`+ return -1, err`
`184`	`184`	`}`
`185`	`185`	`case host.AttachExit:`
`186`	`186`	`if _, err := io.ReadFull(r, buf[:]); err != nil {`
`187`		`- return 0, err`
	`187`	`+ return -1, err`
`188`	`188`	`}`
`189`	`189`	`return int(binary.BigEndian.Uint32(buf[:])), nil`
`190`	`190`	`case host.AttachError:`
`191`	`191`	`if _, err := io.ReadFull(r, buf[:]); err != nil {`
`192`		`- return 0, err`
	`192`	`+ return -1, err`
`193`	`193`	`}`
`194`	`194`	`length := int64(binary.BigEndian.Uint32(buf[:]))`
`195`	`195`	`errBytes := make([]byte, length)`
`196`	`196`	`if _, err := io.ReadFull(r, errBytes); err != nil {`
`197`		`- return 0, err`
	`197`	`+ return -1, err`
`198`	`198`	`}`
`199`		`- return 0, errors.New(string(errBytes))`
	`199`	`+ return -1, errors.New(string(errBytes))`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`}`