fix: remove dead code and actually set metric

soerenschneider · Jul 4, 2023 · 1b08613 · 1b08613
1 parent 59fe078
commit 1b08613
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/cmd/client/client.go b/cmd/client/client.go
@@ -51,6 +51,7 @@ func main() {
 	if err := env.Parse(config); err != nil {
 		log.Fatal().Msgf("%+v\n", err)
 	}
+	metrics.MqttBrokersConfiguredTotal.Set(float64(len(config.Brokers)))
 
 	// supply once flag value
 	config.Once = *once

diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -82,6 +82,7 @@ func RunServer(configPath string) {
 	if err != nil {
 		log.Fatal().Msgf("Config validation failed: %v", err)
 	}
+	metrics.MqttBrokersConfiguredTotal.Set(float64(len(config.Brokers)))
 	conf.PrintFields(config, conf.SensitiveFields...)
 
 	var notificationImpl notification.Notification

diff --git a/conf/mqtt.go b/conf/mqtt.go
@@ -3,10 +3,8 @@ package conf
 import (
 	"crypto/tls"
 	"crypto/x509"
-	"errors"
 	"fmt"
 	"github.com/rs/zerolog/log"
-	"github.com/soerenschneider/dyndns/internal/metrics"
 	"os"
 )
 
@@ -67,18 +65,3 @@ func (conf MqttConfig) String() string {
 
 	return base
 }
-
-func (conf *MqttConfig) Validate() error {
-	metrics.MqttBrokersConfiguredTotal.Set(float64(len(conf.Brokers)))
-	if len(conf.Brokers) == 0 {
-		return errors.New("no brokers configured")
-	}
-
-	for _, broker := range conf.Brokers {
-		if !IsValidUrl(broker) {
-			return fmt.Errorf("no valid host given: %s", broker)
-		}
-	}
-
-	return nil
-}