mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-11 13:57:36 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'dev-2.0' of github.com:prometheus/prometheus into dev-2.0

Browse source
This commit is contained in:
Fabian Reinartz 2017-09-07 14:15:12 +02:00
parent 0efecea6d4 153cb0cbe3
commit a8887f46dc
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
retrieval/scrape.go
View file

@ -637,9 +637,12 @@ mainLoop:
var b []byte
if scrapeErr == nil {
b = buf.Bytes()
} else if errc != nil {
} 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,
// we still call sl.append to trigger stale markers.