brokers/manager: Run cleanup function, if any, on errors

ubuntu · Nov 21, 2024 · 4bd8ec9 · 4bd8ec9
1 parent ea14639
commit 4bd8ec9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/internal/brokers/manager.go b/internal/brokers/manager.go
@@ -40,10 +40,17 @@ func NewManager(ctx context.Context, brokersConfPath string, configuredBrokers [
 	brokersConfPathWithExample, cleanup, err := useExampleBrokers()
 	if err != nil {
 		return nil, err
-	} else if brokersConfPathWithExample != "" {
+	}
+	if brokersConfPathWithExample != "" {
 		brokersConfPath = brokersConfPathWithExample
 	}
 
+	defer func() {
+		if err != nil && cleanup != nil {
+			cleanup()
+		}
+	}()
+
 	// Connect to the system bus
 	// Don't call dbus.SystemBus which caches globally system dbus (issues in tests)
 	bus, err := dbus.ConnectSystemBus()