fix 2 error codes captures, work on #1104

grafana · Sep 18, 2019 · 445689f · 445689f
1 parent ab970ca
commit 445689f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/lib/netext/httpext/error_codes.go b/lib/netext/httpext/error_codes.go
@@ -133,11 +133,13 @@ func errorCodeForError(err error) (errCode, string) {
 			return defaultNetNonTCPErrorCode, err.Error()
 		}
 		if e.Op == "write" {
-			switch e.Err.Error() {
-			case syscall.ECONNRESET.Error():
-				return tcpResetByPeerErrorCode, tcpResetByPeerErrorCodeMsg
-			case syscall.EPIPE.Error():
-				return tcpBrokenPipeErrorCode, tcpBrokenPipeErrorCodeMsg
+			if sErr, ok := e.Err.(*os.SyscallError); ok {
+				switch sErr.Err {
+				case syscall.ECONNRESET:
+					return tcpResetByPeerErrorCode, tcpResetByPeerErrorCodeMsg
+				case syscall.EPIPE:
+					return tcpBrokenPipeErrorCode, tcpBrokenPipeErrorCodeMsg
+				}
 			}
 		}
 		if e.Op == "dial" {

diff --git a/lib/netext/httpext/error_codes_test.go b/lib/netext/httpext/error_codes_test.go
@@ -113,8 +113,8 @@ func TestUnknownNetErrno(t *testing.T) {
 func TestTCPErrors(t *testing.T) {
 	var (
 		nonTCPError       = &net.OpError{Net: "something", Err: errors.New("non tcp error")}
-		econnreset        = &net.OpError{Net: "tcp", Op: "write", Err: syscall.ECONNRESET}
-		epipeerror        = &net.OpError{Net: "tcp", Op: "write", Err: syscall.EPIPE}
+		econnreset        = &net.OpError{Net: "tcp", Op: "write", Err: &os.SyscallError{Err: syscall.ECONNRESET}}
+		epipeerror        = &net.OpError{Net: "tcp", Op: "write", Err: &os.SyscallError{Err: syscall.EPIPE}}
 		econnrefused      = &net.OpError{Net: "tcp", Op: "dial", Err: &os.SyscallError{Err: syscall.ECONNREFUSED}}
 		errnounknown      = &net.OpError{Net: "tcp", Op: "dial", Err: &os.SyscallError{Err: syscall.E2BIG}}
 		tcperror          = &net.OpError{Net: "tcp", Err: errors.New("tcp error")}