Merge pull request #104 from prometheus/remove-procfs-supported-fn

juliusv · juliusv · commit 3657dc80023b · 2015-04-01T01:53:30.000+02:00
Inline and remove processCollectSupported().
diff --git a/prometheus/process_collector.go b/prometheus/process_collector.go
@@ -81,7 +81,7 @@ func NewProcessCollectorPIDFn(
 	}
 
 	// Set up process metric collection if supported by the runtime.
-	if processCollectSupported() {
+	if _, err := procfs.NewStat(); err == nil {
 		c.collectFn = c.processCollect
 	}
 
@@ -103,13 +103,6 @@ func (c *processCollector) Collect(ch chan<- Metric) {
 	c.collectFn(ch)
 }
 
-func processCollectSupported() bool {
-	if _, err := procfs.NewStat(); err == nil {
-		return true
-	}
-	return false
-}
-
 // TODO(ts): Bring back error reporting by reverting 7faf9e7 as soon as the
 // client allows users to configure the error behavior.
 func (c *processCollector) processCollect(ch chan<- Metric) {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func NewProcessCollectorPIDFn(`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// Set up process metric collection if supported by the runtime.`
`84`		`- if processCollectSupported() {`
	`84`	`+ if _, err := procfs.NewStat(); err == nil {`
`85`	`85`	`c.collectFn = c.processCollect`
`86`	`86`	`}`
`87`	`87`
`@@ -103,13 +103,6 @@ func (c *processCollector) Collect(ch chan<- Metric) {`
`103`	`103`	`c.collectFn(ch)`
`104`	`104`	`}`
`105`	`105`
`106`		`-func processCollectSupported() bool {`
`107`		`- if _, err := procfs.NewStat(); err == nil {`
`108`		`- return true`
`109`		`- }`
`110`		`- return false`
`111`		`-}`
`112`		`-`
`113`	`106`	`// TODO(ts): Bring back error reporting by reverting 7faf9e7 as soon as the`
`114`	`107`	`// client allows users to configure the error behavior.`
`115`	`108`	`func (c *processCollector) processCollect(ch chan<- Metric) {`