Skip to content

🌱 Update certpoolwatcher log levels #1918

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

Merged
merged 1 commit into from
Apr 15, 2025
Merged

🌱 Update certpoolwatcher log levels #1918

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions internal/shared/util/http/certlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func LogDockerCertificates(path string, log logr.Logger) {
continue
}
if !fi.IsDir() {
log.V(defaultLogLevel+1).Info("not a directory", "directory", path)
log.V(defaultLogLevel).Info("not a directory", "directory", path)
continue
}
dirEntries, err := os.ReadDir(path)
Expand All @@ -50,7 +50,7 @@ func LogDockerCertificates(path string, log logr.Logger) {
continue
}
if !fi.IsDir() {
log.V(defaultLogLevel+1).Info("ignoring non-directory", "path", hostPath)
log.V(defaultLogLevel).Info("ignoring non-directory", "path", hostPath)
continue
}
logPath(hostPath, "dump docker certs", log)
Expand Down Expand Up @@ -103,7 +103,7 @@ func logPath(path, action string, log logr.Logger) {
continue
}
if fi.IsDir() {
log.V(defaultLogLevel+1).Info("ignoring subdirectory", "directory", file)
log.V(defaultLogLevel).Info("ignoring subdirectory", "directory", file)
continue
}
logFile(e.Name(), path, action, log)
Expand Down
4 changes: 2 additions & 2 deletions internal/shared/util/http/certutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ func NewCertPool(caDir string, log logr.Logger) (*x509.CertPool, error) {
return nil, err
}
if fi.IsDir() {
log.V(defaultLogLevel+1).Info("skip directory", "name", e.Name())
log.V(defaultLogLevel).Info("skip directory", "name", e.Name())
continue
}
log.V(defaultLogLevel+1).Info("load certificate", "name", e.Name())
log.V(defaultLogLevel).Info("load certificate", "name", e.Name(), "size", fi.Size(), "modtime", fi.ModTime())
data, err := os.ReadFile(file)
if err != nil {
return nil, fmt.Errorf("error reading cert file %q: %w", file, err)
Expand Down
Loading