Skip to content

Commit

Permalink
Log SASL connection and handshake errors
Browse files Browse the repository at this point in the history
I'm trying to debug an issue and the logger is only logging:
`Error while performing SASL handshake kafka-1:9093` since the
actual error is not logged, it's not clear what went wrong.

Signed-off-by: Pierangelo Di Pilato <[email protected]>
  • Loading branch information
pierDipi committed Oct 1, 2024
1 parent 8d4b79b commit a721a20
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions broker.go
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,9 @@ func (b *Broker) Open(conf *Config) error {
if b.connErr != nil {
err = b.conn.Close()
if err == nil {
DebugLogger.Printf("Closed connection to broker %s\n", b.addr)
DebugLogger.Printf("Closed connection to broker %s due to SASL v0 auth error: %s\n", b.addr, b.connErr.Error())
} else {
Logger.Printf("Error while closing connection to broker %s: %s\n", b.addr, err)
Logger.Printf("Error while closing connection to broker %s (due to SASL v0 auth error: %s): %s\n", b.addr, b.connErr.Error(), err)
}
b.conn = nil
atomic.StoreInt32(&b.opened, 0)
Expand All @@ -264,9 +264,9 @@ func (b *Broker) Open(conf *Config) error {
<-b.done
err = b.conn.Close()
if err == nil {
DebugLogger.Printf("Closed connection to broker %s\n", b.addr)
DebugLogger.Printf("Closed connection to broker %s due to SASL v1 auth error: %s\n", b.addr, b.connErr.Error())
} else {
Logger.Printf("Error while closing connection to broker %s: %s\n", b.addr, err)
Logger.Printf("Error while closing connection to broker %s (due to SASL v1 auth error: %s): %s\n", b.addr, b.connErr.Error(), err)
}
b.conn = nil
atomic.StoreInt32(&b.opened, 0)
Expand Down Expand Up @@ -1242,12 +1242,12 @@ func (b *Broker) authenticateViaSASLv1() error {

handshakeErr := b.sendInternal(handshakeRequest, prom)
if handshakeErr != nil {
Logger.Printf("Error while performing SASL handshake %s\n", b.addr)
Logger.Printf("Error while performing SASL handshake %s: %s\n", b.addr, handshakeErr.Error())
return handshakeErr
}
handshakeErr = handleResponsePromise(handshakeRequest, handshakeResponse, prom, metricRegistry)
if handshakeErr != nil {
Logger.Printf("Error while performing SASL handshake %s\n", b.addr)
Logger.Printf("Error while handling SASL handshake response %s: %s\n", b.addr, handshakeErr.Error())
return handshakeErr
}

Expand All @@ -1267,7 +1267,7 @@ func (b *Broker) authenticateViaSASLv1() error {
}
authErr = handleResponsePromise(authenticateRequest, authenticateResponse, prom, metricRegistry)
if authErr != nil {
Logger.Printf("Error while performing SASL Auth %s\n", b.addr)
Logger.Printf("Error while performing SASL Auth %s: %s\n", b.addr, authErr.Error())
return nil, authErr
}

Expand Down Expand Up @@ -1385,7 +1385,7 @@ func (b *Broker) sendAndReceiveSASLPlainAuthV0() error {
if b.conf.Net.SASL.Handshake {
handshakeErr := b.sendAndReceiveSASLHandshake(SASLTypePlaintext, b.conf.Net.SASL.Version)
if handshakeErr != nil {
Logger.Printf("Error while performing SASL handshake %s\n", b.addr)
Logger.Printf("Error while performing SASL handshake %s: %s\n", b.addr, handshakeErr.Error())
return handshakeErr
}
}
Expand Down

0 comments on commit a721a20

Please sign in to comment.