Skip to content

Commit f2abe8d

Browse files
committed
INFRA-3598: Don't use generic string error on 11600 error
1 parent ce4dcd9 commit f2abe8d

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

auth.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ func (socket *mongoSocket) resetNonce() {
133133
if result.Code == 13390 {
134134
// mongos doesn't yet support auth (see http://j.mp/mongos-auth)
135135
result.Nonce = "mongos"
136+
} else if result.Code == 11600 {
137+
socket.kill(errServerClosed, true)
138+
return
136139
} else if result.Nonce == "" {
137140
var msg string
138141
if result.Err != "" {
@@ -343,7 +346,7 @@ func (socket *mongoSocket) loginSASL(cred Credential) error {
343346
server.close(true)
344347
}
345348
lock(false)
346-
socket.kill(errors.New("server_shutdown: "+res.ErrMsg), true)
349+
socket.kill(errServerClosed, true)
347350
}
348351
return fmt.Errorf("server returned error on SASL authentication step: %s", res.ErrMsg)
349352
}

socket.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ func (socket *mongoSocket) readLoop() {
769769
if socket.server != nil {
770770
socket.server.close(true)
771771
}
772-
socket.kill(errors.New("server_shutdown: "+replyError.ErrMsg), true)
772+
socket.kill(errServerClosed, true)
773773
return
774774
}
775775

0 commit comments

Comments
 (0)