Fix weird things after merge.

And I swear I'll never use 'rebase' to 'clean something up' ever agin,
even if Julius tells me to do so...

Change-Id: Ifeabab20445279bf693c95f062da769b60fe195f
This commit is contained in:
Bjoern Rabenstein 2014-11-25 17:39:02 +01:00
parent 3a17aeabfd
commit ea86f7e8f8
2 changed files with 0 additions and 16 deletions

View file

@ -23,7 +23,6 @@ import (
"github.com/golang/glog"
"github.com/prometheus/client_golang/extraction"
registry "github.com/prometheus/client_golang/prometheus"
clientmodel "github.com/prometheus/client_golang/model"
registry "github.com/prometheus/client_golang/prometheus"

View file

@ -219,18 +219,3 @@ func (n *NotificationHandler) Collect(ch chan<- prometheus.Metric) {
ch <- n.notificationsQueueLength
ch <- n.notificationsQueueCapacity
}
// Describe implements prometheus.Collector.
func (n *NotificationHandler) Describe(ch chan<- *prometheus.Desc) {
n.notificationLatency.Describe(ch)
ch <- n.notificationsQueueLength.Desc()
ch <- n.notificationsQueueCapacity.Desc()
}
// Collect implements prometheus.Collector.
func (n *NotificationHandler) Collect(ch chan<- prometheus.Metric) {
n.notificationLatency.Collect(ch)
n.notificationsQueueLength.Set(float64(len(n.pendingNotifications)))
ch <- n.notificationsQueueLength
ch <- n.notificationsQueueCapacity
}