Remove monitor go-routines

Signed-off-by: Tomoki Sugiura <[email protected]>

pkg/monitor-hw/cmd/dell.go

@@ -6,14 +6,14 @@ import (
 	"github.com/cybozu-go/well"
 )
 
-func monitorDell(ctx context.Context) error {
-	if err := initDell(ctx); err != nil {
+func initDell(ctx context.Context) error {
+	if err := setupDell(ctx); err != nil {
 		return err
 	}
 	return resetDell(ctx)
 }
 
-func initDell(ctx context.Context) error {
+func setupDell(ctx context.Context) error {
 	if err := well.CommandContext(ctx, "/usr/libexec/instsvcdrv-helper", "start").Run(); err != nil {
 		return err
 	}

pkg/monitor-hw/cmd/root.go

@@ -51,12 +51,10 @@ var rootCmd = &cobra.Command{
 			return err
 		}
 
-		var monitor func(context.Context) error
 		var client redfish.Client
 		var ruleGetter redfish.RuleGetter
 		switch vendor {
 		case lib.QEMU:
-			monitor = monitorQEMU
 			client = redfish.NewMockClient(redfish.DummyRedfishFile)
 			ruleFile := "qemu.yml"
 			rule, ok := redfish.Rules[ruleFile]
@@ -68,7 +66,9 @@ var rootCmd = &cobra.Command{
 			}
 
 		case lib.Dell:
-			monitor = monitorDell
+			if err := initDell(cmd.Context()); err != nil {
+				return err
+			}
 			cc := &redfish.ClientConfig{
 				AddressConfig: ac,
 				UserConfig:    uc,
@@ -96,15 +96,12 @@ var rootCmd = &cobra.Command{
 			return errors.New("unsupported vendor hardware")
 		}
 
-		err = startExporter(ruleGetter, client)
-		if err != nil {
+		if err := startExporter(ruleGetter, client); err != nil {
 			return err
 		}
 
-		well.Go(monitor)
 		well.Stop()
-		err = well.Wait()
-		if err != nil && !well.IsSignaled(err) {
+		if err := well.Wait(); err != nil && !well.IsSignaled(err) {
 			return err
 		}
 		return nil