refactor the magic constant for signaling back to tunneled command lines

convox · Dec 3, 2015 · 04578cf · 04578cf
1 parent 6dc3f9c
commit 04578cf
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/api/models/app.go b/api/models/app.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/convox/rack/api/helpers"
+	"github.com/convox/rack/client"
 
 	"github.com/convox/rack/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws"
 	"github.com/convox/rack/Godeps/_workspace/src/github.com/aws/aws-sdk-go/aws/awserr"
@@ -20,6 +21,8 @@ import (
 
 var CustomTopic = os.Getenv("CUSTOM_TOPIC")
 
+var StatusCodePrefix = client.StatusCodePrefix
+
 type App struct {
 	Name    string `json:"name"`
 	Release string `json:"release"`
@@ -340,7 +343,7 @@ func (a *App) ExecAttached(pid, command string, rw io.ReadWriter) error {
 		return err
 	}
 
-	_, err = rw.Write([]byte(fmt.Sprintf("F1E49A85-0AD7-4AEF-A618-C249C6E6568D:%d\n", ires.ExitCode)))
+	_, err = rw.Write([]byte(fmt.Sprintf("%s%d\n", StatusCodePrefix, ires.ExitCode)))
 
 	if err != nil {
 		return err
@@ -475,7 +478,7 @@ func (a *App) RunAttached(process, command string, rw io.ReadWriter) error {
 		return err
 	}
 
-	_, err = rw.Write([]byte(fmt.Sprintf("F1E49A85-0AD7-4AEF-A618-C249C6E6568D:%d\n", code)))
+	_, err = rw.Write([]byte(fmt.Sprintf("%s%d\n", StatusCodePrefix, code)))
 
 	if err != nil {
 		return err

diff --git a/api/models/instances.go b/api/models/instances.go
@@ -139,7 +139,7 @@ func InstanceSSH(id, command, term string, height, width int, rw io.ReadWriter)
 		code = exitCode(err)
 	}
 
-	_, err = rw.Write([]byte(fmt.Sprintf("F1E49A85-0AD7-4AEF-A618-C249C6E6568D:%d\n", code)))
+	_, err = rw.Write([]byte(fmt.Sprintf("%s%d\n", StatusCodePrefix, code)))
 
 	if err != nil {
 		return err

diff --git a/client/client.go b/client/client.go
@@ -19,6 +19,9 @@ import (
 
 var MinimumServerVersion = "20151023042141"
 
+//this just needs to be random enough to never show up again in a byte stream
+var StatusCodePrefix = "F1E49A85-0AD7-4AEF-A618-C249C6E6568D:"
+
 type Client struct {
 	Host     string
 	Password string

diff --git a/client/processes.go b/client/processes.go
@@ -129,7 +129,7 @@ func copyWithExit(w io.Writer, r io.Reader, ch chan int) {
 			isTerminalRaw = true
 		}
 
-		if s := string(buf[0:n]); strings.HasPrefix(s, "F1E49A85-0AD7-4AEF-A618-C249C6E6568D:") {
+		if s := string(buf[0:n]); strings.HasPrefix(s, StatusCodePrefix) {
 			code, _ := strconv.Atoi(strings.TrimSpace(s[37:]))
 			ch <- code
 			return