1.0.10 (#30) (#31)

* create docker image * Update docker-image.yml * better error * fix maxmind workflow * fix: duplicate library * update version
TOomaAh · Aug 4, 2024 · e343724 · e343724
1 parent bb4b800
commit e343724
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/cmd/app/main.go b/cmd/app/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"TOomaAh/emby_exporter_go/conf"
 	"TOomaAh/emby_exporter_go/internal/app"
+	"TOomaAh/emby_exporter_go/internal/conf"
 	"TOomaAh/emby_exporter_go/pkg/logger"
 	"os"
 	"time"

diff --git a/internal/app/app.go b/internal/app/app.go
@@ -1,7 +1,7 @@
 package app
 
 import (
-	"TOomaAh/emby_exporter_go/conf"
+	"TOomaAh/emby_exporter_go/internal/conf"
 	"TOomaAh/emby_exporter_go/internal/metrics"
 	"TOomaAh/emby_exporter_go/pkg/emby"
 	"TOomaAh/emby_exporter_go/pkg/geoip"
@@ -24,9 +24,6 @@ func logRequest(handler http.Handler) http.Handler {
 }
 
 func Run(config *conf.Config, logger logger.Interface) {
-	// Waiting signal
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, os.Interrupt)
 
 	db, err := geoip.InitGeoIPDatabase(config.Options.GeoIP)
 	if err != nil {
@@ -45,7 +42,12 @@ func Run(config *conf.Config, logger logger.Interface) {
 		os.Exit(0)
 	}()
 
-	embyServer := emby.NewServer(&config.Server, logger)
+	embyServer := emby.NewServer(&emby.ServerInfo{
+		Hostname: config.Server.Hostname,
+		Port:     config.Server.Port,
+		UserID:   config.Server.UserID,
+		Token:    config.Server.Token,
+	}, logger)
 	errorPing := embyServer.Ping()
 	if errorPing != nil {
 		logger.Error("Server is not reachable")

diff --git a/conf/conf.go → internal/conf/conf.go b/conf/conf.go → internal/conf/conf.go
@@ -46,6 +46,8 @@ func NewConfig(path string) (*Config, error) {
 		os.Exit(-1)
 	}
 
+	fmt.Printf("Configuration : %+v\n", config)
+
 	return &config, nil
 
 }
diff --git a/internal/metrics/library.go b/internal/metrics/library.go
@@ -8,7 +8,7 @@ import (
 )
 
 var (
-	libraryValue = []string{"name"}
+	libraryValue = []string{"id", "name"}
 )
 
 type LibraryCollector struct {
@@ -47,6 +47,7 @@ func (c *LibraryCollector) Collect(ch chan<- prometheus.Metric) {
 		ch <- prometheus.MustNewConstMetric(
 			c.library,
 			prometheus.GaugeValue, float64(librarySize),
+			l.ItemID,
 			l.Name,
 		)
 	}

diff --git a/pkg/emby/server.go b/pkg/emby/server.go
@@ -1,7 +1,6 @@
 package emby
 
 import (
-	"TOomaAh/emby_exporter_go/conf"
 	"TOomaAh/emby_exporter_go/internal/entity"
 	"TOomaAh/emby_exporter_go/pkg/logger"
 	"TOomaAh/emby_exporter_go/pkg/request"
@@ -32,12 +31,18 @@ type Server struct {
 	Logger logger.Interface
 }
 
-func NewServer(s *conf.Server, logger logger.Interface) *Server {
-	client, err := request.NewClient(s.Hostname+":"+s.Port, s.Token)
 
-	if err != nil {
-		logger.Fatal("Cannot create a new client for Emby Server " + err.Error())
-		os.Exit(1)
+type ServerInfo struct {
+	Hostname string
+	Port     string
+	UserID   string
+	Token    string
+}
+
+
+func NewServer(s *ServerInfo, logger logger.Interface) *Server {
+	if s.Hostname == "" {
+		s.Hostname = "http://localhost"
 	}
 
 	if s.Port == "" {
@@ -54,8 +59,11 @@ func NewServer(s *conf.Server, logger logger.Interface) *Server {
 		os.Exit(1)
 	}
 
-	if s.Hostname == "" {
-		s.Hostname = "localhost"
+	client, err := request.NewClient(s.Hostname+":"+s.Port, s.Token)
+
+	if err != nil {
+		logger.Fatal("Cannot create a new client for Emby Server " + err.Error())
+		os.Exit(1)
 	}
 
 	server := &Server{
@@ -150,9 +158,6 @@ func (s *Server) GetServerInfo() (*entity.SystemInfo, error) {
 		return nil, err
 	}
 
-	if err != nil {
-		return nil, err
-	}
 	return &systemInfo, nil
 }
 

diff --git a/version.go b/version.go
@@ -1,5 +1,5 @@
 package main
 
 const (
-	Version = "1.0.9"
+	Version = "1.0.10"
 )