Skip to content
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.

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

pillar/zedagent: prevent possible crash if 'locConfig' is set to nil #3114

Merged
merged 1 commit into from
Mar 23, 2023
Merged
Changes from all commits
Commits
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: 4 additions & 2 deletions pkg/pillar/cmd/zedagent/handlemetrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -1569,11 +1569,13 @@ func sendMetricsProtobuf(ctx *getconfigContext,
devUUID, "metrics")
sendMetricsProtobufByURL(ctx, url, ReportMetrics, iteration)

locConfig := ctx.locConfig

// Repeat metrics for LOC as well
if ctx.locConfig != nil {
if locConfig != nil {
// Don't block current execution context
go func() {
url := zedcloud.URLPathString(ctx.locConfig.LocURL, zedcloudCtx.V2API,
url := zedcloud.URLPathString(locConfig.LocURL, zedcloudCtx.V2API,
devUUID, "metrics")
sendMetricsProtobufByURL(ctx, url, ReportMetrics, iteration)
}()
Expand Down