Minimal refactor and cosmetic changes based on feedback

internal/service/event_listener.go

@@ -98,19 +98,23 @@ func translateUnitSubStatus(unit *dbus.UnitStatus) unitSubState {
 }
 
 func (e *EventListener) Add(workloadName string) {
-	name := fmt.Sprintf("%s.service", workloadName)
+	name := formatServiceName(workloadName)
 	log.Debugf("Adding service for events %s", name)
 	if !e.set.Contains(name) {
 		e.set.Add(name)
 	}
 }
 
 func (e *EventListener) Remove(workloadName string) {
-	name := fmt.Sprintf("%s.service", workloadName)
+	name := formatServiceName(workloadName)
 	log.Debugf("Removing service for events %s", name)
 	e.set.Remove(name)
 }
 
 func extractWorkloadName(serviceName string) string {
 	return serviceName[:len(serviceName)-servicePostfixLength]
 }
+
+func formatServiceName(workloadName string) string {
+	return fmt.Sprintf("%s.service", workloadName)
+}

internal/service/systemd.go

@@ -20,7 +20,6 @@ const (
 	DefaultRestartTimeout = 15
 	TimerSuffix           = ".timer"
 	ServiceSuffix         = ".service"
-	DefaultNameSeparator  = "-"
 )
 
 var (

internal/workload/wrapper.go

@@ -282,9 +282,9 @@ func (ww *Workload) removeService(workloadName string) error {
 		return fmt.Errorf("Cannot remove systemd service for '%s': %s", workloadName, err)
 	}
 
-	err = ww.serviceManager.Remove(svc)
+	err := ww.serviceManager.Remove(svc)
 	if err != nil {
-		log.Errorf("unable to remove service from serviceManager %s:%s", workloadName, err)
+		log.Errorf("Unable to remove service from serviceManager %s:%s", workloadName, err)
 	}
 	return nil
 }