Add config file and better logging

Author: DistroByte

Dockerfile

@@ -9,9 +9,9 @@ RUN CGO_ENABLED=0 go build -o bin/molecule .
 
 FROM gcr.io/distroless/static-debian12
 
-COPY --from=builder /go/src/github.com/DistroByte/molecule/bin/molecule /bin/molecule
+COPY --from=builder /go/src/github.com/DistroByte/molecule/bin/molecule /app/molecule
 COPY --from=builder /go/src/github.com/DistroByte/molecule/web /web
 
 WORKDIR /
 
-ENTRYPOINT ["/bin/molecule"]
+ENTRYPOINT ["/app/molecule"]

config.yaml

@@ -0,0 +1,24 @@
+standard_urls:
+  - service: "nomad"
+    url: "http://zeus.internal:4646"
+  - service: "consul"
+    url: "http://zeus.internal:8500"
+  - service: "traefik"
+    url: "http://hermes.internal:8081"
+  - service: "synology-dsm"
+    url: "https://dionysus.internal:5001"
+  - service: "plausible"
+    url: "https://plausible.dbyte.xyz"
+  - service: "photos"
+    url: "https://photos.dbyte.xyz"
+  - service: "drive"
+    url: "https://drive.dbyte.xyz"
+  - service: "plex"
+    url: "https://video.dbyte.xyz"
+  - service: "ghost"
+    url: "https://admin-photo.james-hackett.ie/ghost"
+
+nomad:
+  address: "http://zeus.internal:4646"
+
+apikey: blahblah

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/jedib0t/go-pretty/v6 v6.6.7
 	github.com/rs/zerolog v1.33.0
 	github.com/stretchr/testify v1.10.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -37,5 +38,4 @@ require (
 	github.com/rivo/uniseg v0.4.7 // indirect
 	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/text v0.23.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

internal/api/v1/nomad_service.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/DistroByte/molecule/logger"
 	"github.com/hashicorp/nomad/api"
 	"github.com/jedib0t/go-pretty/v6/table"
-	"github.com/rs/zerolog/log"
 )
 
 type NomadService struct {
@@ -35,24 +35,18 @@ var (
 	servicePorts      = make(map[string]string)
 )
 
-func NewNomadService(nomadClient *api.Client) NomadServiceInterface {
-	standardURLs["nomad"] = "http://zeus.internal:4646"
-	standardURLs["consul"] = "http://zeus.internal:8500"
-	standardURLs["traefik"] = "http://hermes.internal:8081"
-	standardURLs["synology-dsm"] = "https://dionysus.internal:5001"
-	standardURLs["plausible"] = "https://plausible.dbyte.xyz"
-	standardURLs["photos"] = "https://photos.dbyte.xyz"
-	standardURLs["drive"] = "https://drive.dbyte.xyz"
-	standardURLs["plex"] = "https://video.dbyte.xyz"
-	standardURLs["ghost"] = "https://admin-photo.james-hackett.ie/ghost"
+func NewNomadService(nomadClient *api.Client, staticUrls map[string]string) NomadServiceInterface {
+	for key, value := range staticUrls {
+		standardURLs[key] = value
+	}
 
 	return &NomadService{nomadClient: nomadClient}
 }
 
 func (s *NomadService) ExtractAll(print bool) (map[string]string, error) {
 	allocations, _, err := s.nomadClient.Allocations().List(nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to list allocations")
+		logger.Log.Error().Err(err).Msg("Failed to list allocations")
 		return nil, err
 	}
 
@@ -91,7 +85,7 @@ func (s *NomadService) ExtractAll(print bool) (map[string]string, error) {
 func (s *NomadService) ExtractURLs() (map[string]string, error) {
 	allocations, _, err := s.nomadClient.Allocations().List(nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to list allocations")
+		logger.Log.Error().Err(err).Msg("Failed to list allocations")
 		return nil, err
 	}
 
@@ -114,7 +108,7 @@ func (s *NomadService) ExtractURLs() (map[string]string, error) {
 func (s *NomadService) ExtractHostPorts() (map[string]string, error) {
 	allocations, _, err := s.nomadClient.Allocations().List(nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to list allocations")
+		logger.Log.Error().Err(err).Msg("Failed to list allocations")
 		return nil, err
 	}
 
@@ -133,7 +127,7 @@ func (s *NomadService) ExtractHostPorts() (map[string]string, error) {
 func (s *NomadService) ExtractServicePorts() (map[string]string, error) {
 	allocations, _, err := s.nomadClient.Allocations().List(nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to list allocations")
+		logger.Log.Error().Err(err).Msg("Failed to list allocations")
 		return nil, err
 	}
 
@@ -152,7 +146,7 @@ func (s *NomadService) ExtractServicePorts() (map[string]string, error) {
 func (s *NomadService) GetServiceStatus(serviceName string) (map[string]string, error) {
 	allocations, _, err := s.nomadClient.Allocations().List(nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to list allocations")
+		logger.Log.Error().Err(err).Msg("Failed to list allocations")
 		return nil, err
 	}
 
@@ -187,26 +181,26 @@ func (s *NomadService) GetServiceStatus(serviceName string) (map[string]string,
 func (s *NomadService) RestartServiceAllocations(serviceName string) (map[string]string, error) {
 	allocations, _, err := s.nomadClient.Allocations().List(nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to list allocations")
+		logger.Log.Error().Err(err).Msg("Failed to list allocations")
 		return nil, err
 	}
 
 	for _, allocation := range allocations {
 		job, _, err := s.nomadClient.Jobs().Info(allocation.JobID, nil)
 		if err != nil {
-			log.Error().Err(err).Msg("Failed to get job info")
+			logger.Log.Error().Err(err).Msg("Failed to get job info")
 			return nil, err
 		}
 
 		if *job.Name == serviceName {
 			allocationInfo, _, err := s.nomadClient.Allocations().Info(allocation.ID, nil)
 			if err != nil {
-				log.Error().Err(err).Msg("Failed to get allocation info")
+				logger.Log.Error().Err(err).Msg("Failed to get allocation info")
 				return nil, err
 			}
 			err = s.nomadClient.Allocations().Restart(allocationInfo, "", nil)
 			if err != nil {
-				log.Error().Err(err).Msg("Failed to restart service allocations")
+				logger.Log.Error().Err(err).Msg("Failed to restart service allocations")
 				return nil, err
 			}
 		}
@@ -220,19 +214,19 @@ func (s *NomadService) processAllocation(allocation *api.AllocationListStub) {
 
 	allocationInfo, _, err := s.nomadClient.Allocations().Info(allocation.ID, nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to get allocation info")
+		logger.Log.Error().Err(err).Msg("Failed to get allocation info")
 		return
 	}
 
 	node, _, err := s.nomadClient.Nodes().Info(allocation.NodeID, nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to get node info")
+		logger.Log.Error().Err(err).Msg("Failed to get node info")
 		return
 	}
 
 	job, _, err := s.nomadClient.Jobs().Info(allocation.JobID, nil)
 	if err != nil {
-		log.Error().Err(err).Msg("Failed to get job info")
+		logger.Log.Error().Err(err).Msg("Failed to get job info")
 		return
 	}
 

internal/api/v1/nomad_service_mock.go

@@ -1,6 +1,8 @@
 package v1
 
-import "github.com/rs/zerolog/log"
+import (
+	"github.com/DistroByte/molecule/logger"
+)
 
 type MockNomadService struct{}
 
@@ -16,31 +18,31 @@ func NewMockNomadService() NomadServiceInterface {
 }
 
 func (m *MockNomadService) ExtractAll(print bool) (map[string]string, error) {
-	log.Debug().Msg("Mock: ExtractAll called")
+	logger.Log.Debug().Msg("Mock: ExtractAll called")
 	return urls, nil
 }
 
 func (m *MockNomadService) ExtractURLs() (map[string]string, error) {
-	log.Debug().Msg("Mock: ExtractURLs called")
+	logger.Log.Debug().Msg("Mock: ExtractURLs called")
 	return urls, nil
 }
 
 func (m *MockNomadService) ExtractHostPorts() (map[string]string, error) {
-	log.Debug().Msg("Mock: ExtractHostPorts called")
+	logger.Log.Debug().Msg("Mock: ExtractHostPorts called")
 	return urls, nil
 }
 
 func (m *MockNomadService) ExtractServicePorts() (map[string]string, error) {
-	log.Debug().Msg("Mock: ExtractServicePorts called")
+	logger.Log.Debug().Msg("Mock: ExtractServicePorts called")
 	return urls, nil
 }
 
 func (m *MockNomadService) GetServiceStatus(service string) (map[string]string, error) {
-	log.Debug().Msg("Mock: GetServiceStatus called")
+	logger.Log.Debug().Msg("Mock: GetServiceStatus called")
 	return urls, nil
 }
 
 func (m *MockNomadService) RestartServiceAllocations(service string) (map[string]string, error) {
-	log.Debug().Msg("Mock: RestartServiceAllocations called")
+	logger.Log.Debug().Msg("Mock: RestartServiceAllocations called")
 	return urls, nil
 }

logger/logger.go

@@ -0,0 +1,22 @@
+package logger
+
+import (
+	"os"
+
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+)
+
+var Log zerolog.Logger
+
+func InitLogger(level zerolog.Level) {
+	zerolog.SetGlobalLevel(level)
+	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+
+	if level == zerolog.DebugLevel {
+		Log = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+		Log.Info().Msg("running locally in debug mode")
+	} else {
+		Log = zerolog.New(os.Stderr).With().Timestamp().Logger()
+	}
+}