make liner happy

grafana · Aug 27, 2024 · b5a83f5 · b5a83f5
1 parent 2315251
commit b5a83f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/export/prom/prom_test.go b/pkg/export/prom/prom_test.go
@@ -366,7 +366,8 @@ func TestTerminatesOnBadPromPort(t *testing.T) {
 			time.Sleep(5 * time.Second)
 			serverUp <- true
 		}()
-		server.ListenAndServe()
+		err := server.ListenAndServe()
+		fmt.Printf("Terminating server %v\n", err)
 	}()
 
 	sigChan := make(chan os.Signal, 1)

diff --git a/pkg/internal/connector/prommgr.go b/pkg/internal/connector/prommgr.go
@@ -114,7 +114,10 @@ func (pm *PrometheusManager) listenAndServe(ctx context.Context, port int, handl
 			log.Debug("Prometheus endpoint server was closed", "error", err)
 		} else {
 			log.Error("Prometheus endpoint service ended unexpectedly", "error", err)
-			syscall.Kill(os.Getpid(), syscall.SIGINT) // interrupt for graceful shutdown, instead of os.Exit
+			err = syscall.Kill(os.Getpid(), syscall.SIGINT) // interrupt for graceful shutdown, instead of os.Exit
+			if err != nil {
+				log.Error("unable to terminate Beyla", "error", err)
+			}
 		}
 	}()
 	go func() {