Skip to content

Commit 9ed8e35

Browse files
committed
add some logging when adding certs
1 parent a4ab0e5 commit 9ed8e35

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

xhttp/client.go

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ func Client(log slog.Logger, extraCertsPath string) (*http.Client, error) {
1818
return &http.Client{}, nil
1919
}
2020

21+
log = log.With(slog.F("root_path", extraCertsPath))
22+
log.Debug(context.Background(), "adding certs to default pool")
2123
pool, err := certPool(log, extraCertsPath)
2224
if err != nil {
2325
return nil, xerrors.Errorf("cert pool: %w", err)
@@ -47,26 +49,25 @@ func certPool(log slog.Logger, certsPath string) (*x509.CertPool, error) {
4749
return nil, xerrors.Errorf("stat %v: %w", certsPath, err)
4850
}
4951

50-
if fi.IsDir() {
51-
entries, err := os.ReadDir(certsPath)
52+
if !fi.IsDir() {
53+
err = addCert(log, pool, certsPath)
5254
if err != nil {
53-
return nil, xerrors.Errorf("read dir %v: %w", certsPath, err)
55+
return nil, xerrors.Errorf("add cert: %w", err)
5456
}
55-
56-
for _, entry := range entries {
57-
path := filepath.Join(certsPath, entry.Name())
58-
err = addCert(log, pool, path)
59-
if err != nil {
60-
return nil, xerrors.Errorf("add cert: %w", err)
61-
}
62-
}
63-
6457
return pool, nil
6558
}
6659

67-
err = addCert(log, pool, certsPath)
60+
entries, err := os.ReadDir(certsPath)
6861
if err != nil {
69-
return nil, xerrors.Errorf("add cert: %w", err)
62+
return nil, xerrors.Errorf("read dir %v: %w", certsPath, err)
63+
}
64+
65+
for _, entry := range entries {
66+
path := filepath.Join(certsPath, entry.Name())
67+
err = addCert(log, pool, path)
68+
if err != nil {
69+
return nil, xerrors.Errorf("add cert: %w", err)
70+
}
7071
}
7172

7273
return pool, nil
@@ -82,5 +83,6 @@ func addCert(log slog.Logger, pool *x509.CertPool, path string) error {
8283
log.Error(context.Background(), "failed to append cert",
8384
slog.F("filepath", path))
8485
}
86+
log.Debug(context.Background(), "added cert", slog.F("path", path))
8587
return nil
8688
}

0 commit comments

Comments
 (0)