health/health_server.go

@@ -6,39 +6,20 @@ import (
 	"strconv"
 	"time"
 
-	"go.ntppool.org/common/logger"
 	"golang.org/x/exp/slog"
 	"golang.org/x/sync/errgroup"
 )
 
-type Server struct {
-	log      *slog.Logger
-	healthFn http.HandlerFunc
-}
-
-func NewServer(healthFn http.HandlerFunc) *Server {
-	if healthFn == nil {
-		healthFn = basicHealth
-	}
-	srv := &Server{
-		log:      logger.Setup(),
-		healthFn: healthFn,
-	}
-	return srv
-}
-
-func (srv *Server) SetLogger(log *slog.Logger) {
-	srv.log = log
-}
-
-func (srv *Server) Listen(ctx context.Context, port int) error {
-	srv.log.Info("Starting health listener", "port", port)
+// HealthCheckListener runs simple http server on the specified port for
+// health check probes
+func HealthCheckListener(ctx context.Context, port int, log *slog.Logger) error {
+	log.Info("Starting health listener", "port", port)
 
 	serveMux := http.NewServeMux()
 
-	serveMux.HandleFunc("/__health", srv.healthFn)
+	serveMux.HandleFunc("/__health", basicHealth)
 
-	hsrv := &http.Server{
+	srv := &http.Server{
 		Addr:         ":" + strconv.Itoa(port),
 		ReadTimeout:  10 * time.Second,
 		WriteTimeout: 20 * time.Second,
@@ -49,9 +30,9 @@ func (srv *Server) Listen(ctx context.Context, port int) error {
 	g, ctx := errgroup.WithContext(ctx)
 
 	g.Go(func() error {
-		err := hsrv.ListenAndServe()
+		err := srv.ListenAndServe()
 		if err != http.ErrServerClosed {
-			srv.log.Warn("health check server done listening", "err", err)
+			log.Warn("health check server done listening", "err", err)
 			return err
 		}
 		return nil
@@ -63,8 +44,8 @@ func (srv *Server) Listen(ctx context.Context, port int) error {
 	defer cancel()
 
 	g.Go(func() error {
-		if err := hsrv.Shutdown(ctx); err != nil {
-			srv.log.Error("health check server shutdown failed", "err", err)
+		if err := srv.Shutdown(ctx); err != nil {
+			log.Error("health check server shutdown failed", "err", err)
 			return err
 		}
 		return nil
@@ -73,14 +54,6 @@ func (srv *Server) Listen(ctx context.Context, port int) error {
 	return g.Wait()
 }
 
-// HealthCheckListener runs simple http server on the specified port for
-// health check probes
-func HealthCheckListener(ctx context.Context, port int, log *slog.Logger) error {
-	srv := NewServer(nil)
-	srv.SetLogger(log)
-	return srv.Listen(ctx, port)
-}
-
 func basicHealth(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(200)
 	w.Write([]byte("ok"))

kafka/kafka.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/abh/certman"
 	"github.com/segmentio/kafka-go"
-	"go.ntppool.org/common/logger"
 )
 
 const (
@@ -204,17 +203,3 @@ func (k *Kafka) NewWriter(topic string) (*kafka.Writer, error) {
 
 	return w, nil
 }
-
-func (k *Kafka) CheckPartitions() error {
-	partitions, err := k.conn.ReadPartitions()
-	if err != nil {
-		return err
-	}
-
-	// should this result in an error?
-	if len(partitions) == 0 {
-		log := logger.Setup()
-		log.Info("kafka connection has no partitions")
-	}
-	return nil
-}