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

Merge pull request #1382 from prometheus/beorn7/vendoring

Browse source 
Update common/expfmt vendoring
This commit is contained in:
Fabian Reinartz 2016-02-11 17:06:56 +01:00
parent 83c5ef7c03 6946fb2058
commit 90b9fae638
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
vendor/github.com/prometheus/common/expfmt/text_parse.go generated vendored
View file

@ -108,6 +108,13 @@ func (p *TextParser) TextToMetricFamilies(in io.Reader) (map[string]*dto.MetricF
delete(p.metricFamiliesByName, k) delete(p.metricFamiliesByName, k)
} }
} }
// If p.err is io.EOF now, we have run into a premature end of the input
// stream. Turn this error into something nicer and more
// meaningful. (io.EOF is often used as a signal for the legitimate end
// of an input stream.)
if p.err == io.EOF {
p.parseError("unexpected end of input stream")
}
return p.metricFamiliesByName, p.err return p.metricFamiliesByName, p.err
} }

4
vendor/vendor.json vendored
View file

@ -159,8 +159,8 @@
}, },
{ {
"path": "github.com/prometheus/common/expfmt", "path": "github.com/prometheus/common/expfmt",
"revision": "56b90312e937d43b930f06a59bf0d6a4ae1944bc", "revision": "23070236b1ebff452f494ae831569545c2b61d26",
"revisionTime": "2015-12-09T21:44:25+01:00" "revisionTime": "2016-02-11T16:03:55+01:00"
}, },
{ {
"path": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg", "path": "github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg",