.air.toml

@@ -2,48 +2,14 @@ root = "."
 tmp_dir = "tmp"
 
 [build]
-  args_bin = []
   bin = "./tmp/main"
   cmd = "templ generate && go build -o ./tmp/main ."
-  delay = 1000
   exclude_dir = ["static", "migrations", "node_modules", "tmp"]
-  exclude_file = []
   exclude_regex = ["_test.go", "_templ.go"]
-  exclude_unchanged = false
+  include_ext = ["go", "templ"]
-  follow_symlink = false
+  send_interrupt = true
-  include_dir = []
+  kill_delay = "5s"
-  include_ext = ["go", "templ", "html"]
-  include_file = []
-  kill_delay = "0s"
-  log = "build-errors.log"
-  poll = false
-  poll_interval = 0
-  post_cmd = []
-  pre_cmd = []
-  rerun = false
-  rerun_delay = 500
-  send_interrupt = false
   stop_on_error = true
 
-[color]
-  app = ""
-  build = "yellow"
-  main = "magenta"
-  runner = "green"
-  watcher = "cyan"
-
-[log]
-  main_only = false
-  time = false
-
 [misc]
-  clean_on_exit = false
+  clean_on_exit = true
-
-[proxy]
-  app_port = 0
-  enabled = false
-  proxy_port = 0
-
-[screen]
-  clear_on_rebuild = false
-  keep_scroll = true

main.go

@@ -4,10 +4,15 @@ import (
 	"me-fit/handler"
 	"me-fit/utils"
 
+	"context"
 	"database/sql"
 	"log"
 	"log/slog"
 	"net/http"
+	"os/signal"
+	"sync"
+	"syscall"
+	"time"
 
 	"github.com/joho/godotenv"
 	_ "github.com/mattn/go-sqlite3"
@@ -15,48 +20,66 @@ import (
 )
 
 func main() {
+	run(context.Background())
+}
+
+func run(ctx context.Context) {
+	ctx, cancel := signal.NotifyContext(ctx, syscall.SIGINT, syscall.SIGTERM)
+	defer cancel()
+
 	slog.Info("Starting server...")
 
+	// init env
 	err := godotenv.Load()
 	if err != nil {
 		log.Fatal("Error loading .env file")
 	}
 	utils.MustInitEnv()
 
+	// init db
 	db, err := sql.Open("sqlite3", "./data.db")
 	if err != nil {
 		log.Fatal("Could not open Database data.db: ", err)
 	}
 	defer db.Close()
-
 	utils.MustRunMigrations(db, "")
 
-	startPrometheus()
+	// init servers
-
+	prometheusServer := &http.Server{
-	var server = http.Server{
-		Addr:    ":8080",
-		Handler: handler.GetHandler(db),
-	}
-	slog.Info("Starting server on " + server.Addr)
-
-	err = server.ListenAndServe()
-	if err != nil {
-		panic(err)
-	}
-}
-
-func startPrometheus() {
-
-	var prometheusServer = http.Server{
 		Addr:    ":8081",
 		Handler: promhttp.Handler(),
 	}
+	httpServer := &http.Server{
+		Addr:    ":8080",
+		Handler: handler.GetHandler(db),
+	}
+	go startServer(prometheusServer)
+	go startServer(httpServer)
 
-	go func() {
+	// graceful shutdown
-		slog.Info("Starting prometheus server on " + prometheusServer.Addr)
+	var wg sync.WaitGroup
-		err := prometheusServer.ListenAndServe()
+	wg.Add(2)
-		if err != nil {
+	go shutdownServer(httpServer, ctx, &wg)
-			log.Fatal("Could not start prometheus server: ", err)
+	go shutdownServer(prometheusServer, ctx, &wg)
+	wg.Wait()
+}
+
+func startServer(s *http.Server) {
+	slog.Info("Starting server on " + s.Addr)
+	if err := s.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+		slog.Error("error listening and serving: " + err.Error())
+	}
+}
+
+func shutdownServer(s *http.Server, ctx context.Context, wg *sync.WaitGroup) {
+	defer wg.Done()
+	<-ctx.Done()
+	shutdownCtx := context.Background()
+	shutdownCtx, cancel := context.WithTimeout(shutdownCtx, 10*time.Second)
+	defer cancel()
+	if err := s.Shutdown(shutdownCtx); err != nil {
+		slog.Error("error shutting down http server: " + err.Error())
+	} else {
+		slog.Info("Gracefully stopped http server on " + s.Addr)
 	}
-	}()
 }