Added more error verbosity

Author: jordigilh

cmd/device-worker/main.go

@@ -21,7 +21,7 @@ import (
 	registration2 "github.com/project-flotta/flotta-device-worker/internal/registration"
 	"github.com/project-flotta/flotta-device-worker/internal/server"
 	"github.com/project-flotta/flotta-device-worker/internal/service"
-	workload "github.com/project-flotta/flotta-device-worker/internal/workload"
+	"github.com/project-flotta/flotta-device-worker/internal/workload"
 
 	"net"
 	"os"

internal/service/event_listener.go

@@ -61,21 +61,21 @@ func (e *DBusEventListener) Init(configuration models.DeviceConfigurationMessage
 	log.Infof("Starting DBus event listener")
 	conn, err := newDbusConnection(UserBus)
 	if err != nil {
-		return err
+		return fmt.Errorf("error while starting event listener: %v", err)
 	}
 	e.set = conn.NewSubscriptionSet()
 	for _, w := range configuration.Workloads {
 		s, err := conn.GetUnitPropertyContext(context.Background(), DefaultServiceName(w.Name), "UnitFileState")
 		if err != nil {
-			return err
+			return fmt.Errorf("error while retrieving workload '%s' state: %v", w.Name, err)
 		}
-		log.Debugf("Unit UnitFileState property for workload %s:%s", w.Name, s.Value.String())
+		log.Debugf("Unit UnitFileState property for workload '%s':%s", w.Name, s.Value.String())
 		v, err := strconv.Unquote(s.Value.String())
 		if err != nil {
 			return err
 		}
 		if v == "disabled" {
-			log.Warnf("Service for workload %s is disabled", w.Name)
+			log.Warnf("Service for workload '%s' is disabled", w.Name)
 		}
 		e.add(DefaultServiceName(w.Name))
 	}
@@ -88,6 +88,8 @@ func (e *DBusEventListener) Update(configuration models.DeviceConfigurationMessa
 		svcName := DefaultServiceName(wl.Name)
 		if !e.contains(svcName) {
 			e.add(svcName)
+		} else {
+			return fmt.Errorf("unable to add systemd service '%s': there is service unit already being monitored with the same name", svcName)
 		}
 	}
 	return nil

internal/service/systemd.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -127,7 +126,7 @@ func (mgr *systemdManager) write() error {
 	if err != nil {
 		return err
 	}
-	return ioutil.WriteFile(mgr.svcFilePath, svcJson, 0640) //#nosec
+	return os.WriteFile(mgr.svcFilePath, svcJson, 0640) //#nosec
 }
 
 func newDbusConnection(busType BusType) (*dbus.Conn, error) {
@@ -221,7 +220,7 @@ func (s *systemd) reload() error {
 }
 
 func (s *systemd) Start() error {
-	log.Debugf("Starting service %s", s.Name)
+	log.Debugf("Starting systemd service %s", s.Name)
 	conn, err := newDbusConnection(s.BusType)
 	if err != nil {
 		return err
@@ -262,7 +261,7 @@ func (s *systemd) Stop() error {
 }
 
 func (s *systemd) Enable() error {
-	log.Debugf("Enabling service %s", s.Name)
+	log.Debugf("Enabling systemd service %s", s.Name)
 	conn, err := newDbusConnection(s.BusType)
 	if err != nil {
 		return err
@@ -274,7 +273,7 @@ func (s *systemd) Enable() error {
 }
 
 func (s *systemd) Disable() error {
-	log.Debugf("Disabling service %s", s.Name)
+	log.Debugf("Disabling systemd service %s", s.Name)
 	conn, err := newDbusConnection(s.BusType)
 	if err != nil {
 		return err

internal/workload/podman/podman.go

@@ -15,7 +15,7 @@ import (
 	"github.com/blang/semver"
 	"github.com/go-openapi/swag"
 	"github.com/project-flotta/flotta-device-worker/internal/service"
-	api "github.com/project-flotta/flotta-device-worker/internal/workload/api"
+	"github.com/project-flotta/flotta-device-worker/internal/workload/api"
 
 	"github.com/containers/podman/v4/pkg/bindings"
 	"github.com/containers/podman/v4/pkg/bindings/containers"

internal/workload/wrapper.go

@@ -363,16 +363,16 @@ func (w *Workload) ListenServiceEvents() {
 			log.Infof("Service for workload %s started", event.WorkloadName)
 			report, err := w.podManager.GetPodReportForPodName(event.WorkloadName)
 			if err != nil {
-				log.Errorf("unable to get pod report for workload %s:%v", event.WorkloadName, err)
+				log.Errorf("unable to get pod report for workload '%s':%v", event.WorkloadName, err)
 			}
 			for _, observer := range observers {
-				log.Debugf("Triggering WorkloadStarted in observer '%s' for workload %s", observer, event.WorkloadName)
+				log.Debugf("Triggering WorkloadStarted in observer '%s' for workload '%s'", observer, event.WorkloadName)
 				observer.WorkloadStarted(event.WorkloadName, []*podman.PodReport{report})
 			}
 		case service.EventStopped:
-			log.Infof("Service for workload %s stopped", event.WorkloadName)
+			log.Infof("Service for workload '%s' stopped", event.WorkloadName)
 			for _, observer := range observers {
-				log.Debugf("Triggering WorkloadRemoved in observer '%s' for workload %s", observer, event.WorkloadName)
+				log.Debugf("Triggering WorkloadRemoved in observer '%s' for workload '%s'", observer, event.WorkloadName)
 				observer.WorkloadRemoved(event.WorkloadName)
 			}
 		default: