Skip to content

Commit a33832b

Browse files
Fix: Prevent nil errors in setupLog.Error to ensure proper logging
Closes; operator-framework#1566 Closes: operator-framework#1556
1 parent 1601df7 commit a33832b

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

catalogd/cmd/catalogd/main.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package main
1818

1919
import (
2020
"crypto/tls"
21+
"errors"
2122
"flag"
2223
"fmt"
2324
"log"
@@ -145,12 +146,16 @@ func main() {
145146
}
146147

147148
if (certFile != "" && keyFile == "") || (certFile == "" && keyFile != "") {
148-
setupLog.Error(nil, "unable to configure TLS certificates: tls-cert and tls-key flags must be used together")
149+
setupLog.Error(errors.New("missing TLS configuration"),
150+
"message", "tls-cert and tls-key flags must be used together",
151+
"certFile", certFile, "keyFile", keyFile)
149152
os.Exit(1)
150153
}
151154

152155
if metricsAddr != "" && certFile == "" && keyFile == "" {
153-
setupLog.Error(nil, "metrics-bind-address requires tls-cert and tls-key flags to be set")
156+
setupLog.Error(errors.New("invalid metrics configuration"),
157+
"message", "metrics-bind-address requires tls-cert and tls-key flags to be set",
158+
"metricsAddr", metricsAddr, "certFile", certFile, "keyFile", keyFile)
154159
os.Exit(1)
155160
}
156161

cmd/operator-controller/main.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package main
1919
import (
2020
"context"
2121
"crypto/tls"
22+
"errors"
2223
"flag"
2324
"fmt"
2425
"net/http"
@@ -132,12 +133,16 @@ func main() {
132133
}
133134

134135
if (certFile != "" && keyFile == "") || (certFile == "" && keyFile != "") {
135-
setupLog.Error(nil, "unable to configure TLS certificates: tls-cert and tls-key flags must be used together")
136+
setupLog.Error(errors.New("missing TLS configuration"),
137+
"message", "tls-cert and tls-key flags must be used together",
138+
"certFile", certFile, "keyFile", keyFile)
136139
os.Exit(1)
137140
}
138141

139142
if metricsAddr != "" && certFile == "" && keyFile == "" {
140-
setupLog.Error(nil, "metrics-bind-address requires tls-cert and tls-key flags to be set")
143+
setupLog.Error(errors.New("invalid metrics configuration"),
144+
"message", "metrics-bind-address requires tls-cert and tls-key flags to be set",
145+
"metricsAddr", metricsAddr, "certFile", certFile, "keyFile", keyFile)
141146
os.Exit(1)
142147
}
143148

0 commit comments

Comments
 (0)