From 6583a36514c710a45b33d52d134e17c7c120498b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= <ask@develooper.com>
Date: Sat, 8 Jul 2023 21:05:22 -0700
Subject: [PATCH] Adjust port numbers

---
 Dockerfile       |  7 ++++---
 server/server.go | 12 +++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 844eb70..3468378 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,10 +9,11 @@ RUN touch ~app/.zshrc ~root/.zshrc; chown app:app ~app/.zshrc
 RUN mkdir /app
 ADD dist/data-api_linux_amd64_v1/data-api /app/
 
-EXPOSE 4200
-EXPOSE 4290
+EXPOSE 8030 # app
+EXPOSE 9019 # health
+EXPOSE 9020 # metrics
 
 USER app
 
 # Container start command for production
-CMD ["/app/data-api"]
+CMD ["/app/data-api", "server"]
diff --git a/server/server.go b/server/server.go
index f3790a2..e964b4d 100644
--- a/server/server.go
+++ b/server/server.go
@@ -13,6 +13,8 @@ import (
 	"golang.org/x/exp/slog"
 	"golang.org/x/sync/errgroup"
 
+	"go.ntppool.org/common/health"
+	"go.ntppool.org/common/logger"
 	"go.ntppool.org/common/metricsserver"
 
 	chdb "go.ntppool.org/data-api/chdb"
@@ -56,7 +58,7 @@ func NewServer(ctx context.Context) (*Server, error) {
 }
 
 func (srv *Server) Run() error {
-	slog.Info("Run()")
+	log := logger.Setup()
 
 	ctx, cancel := context.WithCancel(srv.ctx)
 	defer cancel()
@@ -64,7 +66,11 @@ func (srv *Server) Run() error {
 	g, _ := errgroup.WithContext(ctx)
 
 	g.Go(func() error {
-		return srv.metrics.ListenAndServe(ctx, 9000)
+		return srv.metrics.ListenAndServe(ctx, 9020)
+	})
+
+	g.Go(func() error {
+		return health.HealthCheckListener(ctx, 9019, log.WithGroup("health"))
 	})
 
 	e := echo.New()
@@ -84,7 +90,7 @@ func (srv *Server) Run() error {
 	e.GET("/api/server/dns/answers/:server", srv.dnsAnswers)
 
 	g.Go(func() error {
-		return e.Start(":8000")
+		return e.Start(":8030")
 	})
 
 	return g.Wait()