Skip to content

fix: invert addWatcher error check and prevent HTTP/TLS server fallthrough in fdbkubernetesmonitor #13045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ronitsabhaya75 wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −1
Open

fix: invert addWatcher error check and prevent HTTP/TLS server fallthrough in fdbkubernetesmonitor #13045

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion fdbkubernetesmonitor/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ func startMonitor(ctx context.Context, logger logr.Logger, configFile string, cu
logger.Error(err, "could not start HTTPS server")
os.Exit(1)
}
return
}
err := http.ListenAndServe(promConfig.listenAddr, mux)
if err != nil {
Expand Down Expand Up @@ -527,7 +528,7 @@ func addWatcher(fileName string, watcher *fsnotify.Watcher) error {
var err error
for retryCnt < maxRetryCnt {
err = watcher.Add(fileName)
if err != nil {
if err == nil {
return nil
}

Expand Down