Minor fixes

Author: TheOneWithTheWrench

lifetime.go

@@ -11,7 +11,7 @@ type TerminationSignal func() syscall.Signal
 func InterruptSignal() syscall.Signal {
 	signals := make(chan os.Signal, 1)
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
-	<-signals
+	sig := <-signals
 
-	return syscall.Signal(0)
+	return sig.(syscall.Signal)
 }

manager.go

@@ -83,14 +83,14 @@ func (m *Manager) setupComponents() error {
 	for _, s := range m.components {
 		setupable, ok := s.Component.(setupable)
 		if ok {
-			m.logger.Info(fmt.Sprintf("[UnixCycle] Setting up component %q", s.name), slog.String("component_name", s.name))
+			m.logInfo(fmt.Sprintf("Setting up component %q", s.name), slog.String("component_name", s.name))
 			err := funcOrTimeout(setupable.Setup, m.setupTimeout)
 			if errors.Is(err, errTimeout) {
-				m.logger.Error(fmt.Sprintf("[UnixCycle] Setup timed out for component %q", s.name), slog.String("component_name", s.name))
+				m.logError(fmt.Sprintf("Setup timed out for component %q", s.name), slog.String("component_name", s.name))
 				return err
 			}
 			if err != nil {
-				m.logger.Error(fmt.Sprintf("[UnixCycle] Failure during setup for component %q: %v", s.name, err), slog.String("component_name", s.name))
+				m.logError(fmt.Sprintf("Failure during setup for component %q: %v", s.name, err), slog.String("component_name", s.name))
 				return err
 			}
 		}
@@ -102,17 +102,17 @@ func (m *Manager) startComponents() {
 	for _, s := range m.components {
 		startable, ok := s.Component.(startable)
 		if ok {
-			m.logger.Info(fmt.Sprintf("[UnixCycle] Starting component %q", s.name), slog.String("component_name", s.name))
+			m.logInfo(fmt.Sprintf("Starting component %q", s.name), slog.String("component_name", s.name))
 			go func() {
 				defer func() {
 					if r := recover(); r != nil {
-						m.logger.Error(fmt.Sprintf("[UnixCycle] Panic during start for component %q: %v", s.name, r), slog.String("component_name", s.name))
+						m.logError(fmt.Sprintf("Panic during start for component %q: %v", s.name, r), slog.String("component_name", s.name))
 						m.exitSignal <- syscall.SIGABRT
 					}
 				}()
 				err := startable.Start() // Blocking for go routine
 				if err != nil {
-					m.logger.Error(fmt.Sprintf("[UnixCycle] Failure during start for component %q: %v", s.name, err), slog.String("component_name", s.name))
+					m.logError(fmt.Sprintf("Failure during start for component %q: %v", s.name, err), slog.String("component_name", s.name))
 					m.exitSignal <- syscall.SIGABRT
 				}
 			}()
@@ -122,26 +122,30 @@ func (m *Manager) startComponents() {
 
 func (m *Manager) waitForSignal() syscall.Signal {
 	go func() {
-		m.exitSignal <- m.lifetime()
+		select {
+		case m.exitSignal <- m.lifetime():
+		default:
+			// Signal already sent, don't block
+		}
 	}()
 
 	signal := <-m.exitSignal
-	m.logger.Info(fmt.Sprintf("[UnixCycle] Received signal: %v", signal), slog.String("signal", signal.String()))
+	m.logInfo(fmt.Sprintf("Received signal: %v", signal), slog.String("signal", signal.String()))
 	return signal
 }
 
 func (m *Manager) closeComponents() error {
 	for _, s := range slices.Backward(m.components) {
 		closable, ok := s.Component.(closable)
 		if ok {
-			m.logger.Info(fmt.Sprintf("[UnixCycle] Closing component %q", s.name), slog.String("component_name", s.name))
+			m.logInfo(fmt.Sprintf("Closing component %q", s.name), slog.String("component_name", s.name))
 			err := funcOrTimeout(closable.Close, m.closeTimeout)
 			if errors.Is(err, errTimeout) {
-				m.logger.Error(fmt.Sprintf("[UnixCycle] Close timed out for component %q", s.name), slog.String("component_name", s.name))
+				m.logError(fmt.Sprintf("Close timed out for component %q", s.name), slog.String("component_name", s.name))
 				return err
 			}
 			if err != nil {
-				m.logger.Error(fmt.Sprintf("[UnixCycle] Failure during close for component %q: %v", s.name, err), slog.String("component_name", s.name))
+				m.logError(fmt.Sprintf("Failure during close for component %q: %v", s.name, err), slog.String("component_name", s.name))
 				return err
 			}
 		}
@@ -150,6 +154,15 @@ func (m *Manager) closeComponents() error {
 	return nil
 }
 
+func (m *Manager) logInfo(msg string, attrs ...any) {
+	m.logger.Info("[UnixCycle] "+msg, attrs...)
+}
+
+func (m *Manager) logError(msg string, attrs ...any) {
+	m.logger.Error("[UnixCycle] "+msg, attrs...)
+}
+
+// NOTE: goroutine may leak on timeout, but acceptable since timeout usually always leaves to a library shutdown
 func funcOrTimeout(f func() error, timeout time.Duration) error {
 	errs := make(chan error, 1)
 	go func() {

testing.go

@@ -32,7 +32,7 @@ func TestMain(m TestingM, manager *Manager, prober ProberFunc, testFixtures ...C
 		managerStopped = make(chan syscall.Signal)
 		proberLifetime = func() syscall.Signal {
 			if err := prober(context.Background()); err != nil {
-				manager.logger.Error("[UnixCycle] unable to run tests due to prober failing with error", "error", err)
+				manager.logError("unable to run tests due to prober failing with error", "error", err)
 				return syscall.SIGUSR1
 			}
 			return syscall.Signal(m.Run())