github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-19 05:19:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1958 from weaveworks/mike/middleware/errorhandler

Browse Source 
middleware/errorhandler: Fix a bug which meant it never works
This commit is contained in:
Mike Lang
2016-10-31 08:33:08 -07:00
committed by GitHub
parent 654ba35be6 6173e543c8
commit 96058b1137
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/middleware/errorhandler.go
View File

@@ -49,12 +49,12 @@ func newErrorInterceptor(w http.ResponseWriter, code int) *errorInterceptor {
}
// Header implements http.ResponseWriter
func (i errorInterceptor) Header() http.Header {
func (i *errorInterceptor) Header() http.Header {
return i.headers
}
// WriteHeader implements http.ResponseWriter
func (i errorInterceptor) WriteHeader(code int) {
func (i *errorInterceptor) WriteHeader(code int) {
if i.gotCode {
panic("errorInterceptor.WriteHeader() called twice")
}
@@ -69,7 +69,7 @@ func (i errorInterceptor) WriteHeader(code int) {
}
// Write implements http.ResponseWriter
func (i errorInterceptor) Write(data []byte) (int, error) {
func (i *errorInterceptor) Write(data []byte) (int, error) {
if !i.gotCode {
i.WriteHeader(http.StatusOK)
}