Skip to content

Commit

Permalink
Set method in logger
Browse files Browse the repository at this point in the history
  • Loading branch information
whywaita committed Sep 7, 2024
1 parent e428b63 commit c447595
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
7 changes: 4 additions & 3 deletions server/pkg/metric/scrape_lxd.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ func (ScraperLXD) Scrape(ctx context.Context, hostConfigs []config.HostConfig, c
}

func scrapeLXDHosts(ctx context.Context, hostConfigs []config.HostConfig, ch chan<- prometheus.Metric) error {
l := slog.With("method", "scrapeLXDHosts")
hosts, errHosts, err := lxdclient.ConnectLXDs(hostConfigs)
if err != nil {
return fmt.Errorf("failed to connect LXD hosts: %w", err)
Expand All @@ -94,10 +95,10 @@ func scrapeLXDHosts(ctx context.Context, hostConfigs []config.HostConfig, ch cha
go func(host lxdclient.LXDHost) {
defer wg.Done()

l := slog.With("host", host.HostConfig.LxdHost)
_l := l.With("host", host.HostConfig.LxdHost)

if err := scrapeLXDHost(ctx, host, ch, l); err != nil {
l.Warn("failed to scrape LXD host", "err", err.Error())
if err := scrapeLXDHost(ctx, host, ch, _l); err != nil {
_l.Warn("failed to scrape LXD host", "err", err.Error())
}
}(host)
}
Expand Down
7 changes: 4 additions & 3 deletions server/pkg/resourcecache/resource_cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,16 @@ func RunLXDResourceCacheTicker(ctx context.Context, hcs []config.HostConfig, per
}

func reloadLXDHostResourceCache(ctx context.Context, hcs []config.HostConfig) error {
l := slog.With("method", "reloadLXDHostResourceCache")
hosts, _, err := lxdclient.ConnectLXDs(hcs)
if err != nil {
return fmt.Errorf("failed to connect LXD hosts: %s", err)
}

for _, host := range hosts {
l := slog.With("host", host.HostConfig.LxdHost)
if err := setLXDHostResourceCache(ctx, &host, l); err != nil {
l.Warn("failed to set lxd host resource cache", "err", err.Error())
_l := l.With("host", host.HostConfig.LxdHost)
if err := setLXDHostResourceCache(ctx, &host, _l); err != nil {
_l.Warn("failed to set lxd host resource cache", "err", err.Error())
continue
}
}
Expand Down

0 comments on commit c447595

Please sign in to comment.