Merge pull request #29 from InVisionApp/improve-status-code-tracking

Handle StatusCode with StopExecution

Author: talpert

rye.go

@@ -126,9 +126,12 @@ func (m *MWHandler) do(w http.ResponseWriter, r *http.Request, handler Handler)
 				}
 
 				// Write the error out
-				statusCode = strconv.Itoa(resp.StatusCode)
 				WriteJSONStatus(w, "error", resp.Error(), resp.StatusCode)
 			}()
+
+			if resp.StatusCode > 0 {
+				statusCode = strconv.Itoa(resp.StatusCode)
+			}
 		}
 
 		handlerName := getFuncName(handler)

rye_test.go

@@ -185,6 +185,16 @@ var _ = Describe("Rye", func() {
 			})
 		})
 
+		Context("when a handler returns a response with StopExecution and StatusCode", func() {
+			It("should not execute any further handlers", func() {
+				h := mwHandler.Handle([]Handler{stopExecutionWithStatusHandler, successHandler})
+				h.ServeHTTP(response, request)
+
+				Eventually(inc).Should(Receive(Equal(statsInc{"handlers.stopExecutionWithStatusHandler.404", 1, float32(STATRATE)})))
+				Expect(os.Getenv(RYE_TEST_HANDLER_ENV_VAR)).ToNot(Equal("1"))
+			})
+		})
+
 		Context("when a before handler returns a response with StopExecution", func() {
 			It("should not execute any further handlers", func() {
 				request.Method = "OPTIONS"
@@ -330,6 +340,13 @@ func stopExecutionHandler(rw http.ResponseWriter, r *http.Request) *Response {
 	}
 }
 
+func stopExecutionWithStatusHandler(rw http.ResponseWriter, r *http.Request) *Response {
+	return &Response{
+		StopExecution: true,
+		StatusCode:    404,
+	}
+}
+
 func testFunc() {}
 
 func HaveTiming(name string, statrate float32) types.GomegaMatcher {