RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2710 from prometheus/fabxc-patch-1 

retrieval: add missing scrape context cancelation
This commit is contained in:
Fabian Reinartz 2017-05-11 20:30:33 +02:00 committed by GitHub
parent bf64d4efa8 76b3378190
commit 8e73bde650
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
retrieval/scrape.go
View File

@ -471,7 +471,7 @@ func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) {
var ( var (
total, added int total, added int
start = time.Now() start = time.Now()
scrapeCtx, _ = context.WithTimeout(sl.ctx, timeout) scrapeCtx, cancel = context.WithTimeout(sl.ctx, timeout)
) )
// Only record after the first scrape. // Only record after the first scrape.
@ -482,6 +482,7 @@ func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) {
} }
err := sl.scraper.scrape(scrapeCtx, buf) err := sl.scraper.scrape(scrapeCtx, buf)
cancel()
if err == nil { if err == nil {
b := buf.Bytes() b := buf.Bytes()