mirror of
https://github.com/prometheus/prometheus.git
synced 2025-01-11 05:47:27 -08:00
Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0
This commit is contained in:
commit
a8887f46dc
|
@ -637,8 +637,11 @@ mainLoop:
|
|||
var b []byte
|
||||
if scrapeErr == nil {
|
||||
b = buf.Bytes()
|
||||
} else if errc != nil {
|
||||
errc <- scrapeErr
|
||||
} else {
|
||||
sl.l.With("err", scrapeErr.Error()).Debug("scrape failed")
|
||||
if errc != nil {
|
||||
errc <- scrapeErr
|
||||
}
|
||||
}
|
||||
|
||||
// A failed scrape is the same as an empty scrape,
|
||||
|
|
Loading…
Reference in a new issue