Skip to content

Commit

Permalink
Don't call method on potentially nil parsed url; don't log error if s…
Browse files Browse the repository at this point in the history
…hipping is disabled on purpose
  • Loading branch information
RebeccaMahany committed Aug 17, 2023
1 parent 4dbd4bd commit dc8f7ac
Showing 1 changed file with 17 additions and 12 deletions.
29 changes: 17 additions & 12 deletions pkg/log/logshipper/logshipper.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,25 @@ func (ls *LogShipper) Ping() {
ls.sender.authtoken = string(token)

shouldEnable := ls.knapsack.LogIngestServerURL() != ""
parsedUrl, err := url.Parse(ls.knapsack.LogIngestServerURL())
if err != nil || parsedUrl.String() == "" {
// If we have a bad endpoint, just disable for now.
// It will get renabled when control server sends a
// valid endpoint.
shouldEnable = false
level.Debug(ls.baseLogger).Log(
"msg", "error parsing log ingest server url, shipping disabled",
"err", err,
"log_ingest_url", ls.knapsack.LogIngestServerURL(),
)

// Only attempt to parse a URL if we have one
if shouldEnable {
parsedUrl, err := url.Parse(ls.knapsack.LogIngestServerURL())
if err != nil {
// If we have a bad endpoint, just disable for now.
// It will get renabled when control server sends a
// valid endpoint.
shouldEnable = false
level.Debug(ls.baseLogger).Log(
"msg", "error parsing log ingest server url, shipping disabled",
"err", err,
"log_ingest_url", ls.knapsack.LogIngestServerURL(),
)
} else if parsedUrl != nil {
ls.sender.endpoint = parsedUrl.String()
}
}

ls.sender.endpoint = parsedUrl.String()
ls.isShippingEnabled = shouldEnable
ls.addDeviceIdentifyingAttributesToLogger()

Expand Down

0 comments on commit dc8f7ac

Please sign in to comment.