Merge pull request #3 from AchMenz/master

fixed wrong cache behavior (was always 2 minutes)

cmd/mqtt2prometheus.go

@@ -49,7 +49,7 @@ func main() {
 	mqttClientOptions.SetUsername(cfg.MQTT.User)
 	mqttClientOptions.SetPassword(cfg.MQTT.Password)
 
-	collector := metrics.NewCollector(2*time.Minute, cfg.Metrics)
+	collector := metrics.NewCollector(cfg.Cache.Timeout, cfg.Metrics)
 	ingest := metrics.NewIngest(collector, cfg.Metrics)
 
 	errorChan := make(chan error,1)

pkg/config/config.go

@@ -2,9 +2,7 @@ package config
 
 import (
 	"time"
-
 	"io/ioutil"
-
 	"github.com/prometheus/client_golang/prometheus"
 	"gopkg.in/yaml.v2"
 )
@@ -19,13 +17,13 @@ var MQTTConfigDefaults = MQTTConfig{
 }
 
 var CacheConfigDefaults = CacheConfig{
-	Timeout: 2 + time.Minute,
+	Timeout: 2 * time.Minute,
 }
 
 type Config struct {
 	Metrics []MetricConfig `yaml:"metrics"`
 	MQTT    *MQTTConfig    `yaml:"mqtt,omitempty"`
-	Cache   *CacheConfig   `yaml:"timeout,omitempty"`
+	Cache   *CacheConfig   `yaml:"cache,omitempty"`
 }
 
 type CacheConfig struct {