feat: graceful shutdown with signal handling and backup scheduler
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
88
main.go
88
main.go
@@ -1,10 +1,13 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"log"
|
||||
"log/slog"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/tolelom/catacombs/config"
|
||||
@@ -38,16 +41,93 @@ func main() {
|
||||
defer db.Close()
|
||||
|
||||
lobby := game.NewLobby(cfg)
|
||||
startTime := time.Now()
|
||||
|
||||
sshAddr := fmt.Sprintf("0.0.0.0:%d", cfg.Server.SSHPort)
|
||||
webAddr := fmt.Sprintf(":%d", cfg.Server.HTTPPort)
|
||||
|
||||
startTime := time.Now()
|
||||
// Start web server (non-blocking, returns *http.Server)
|
||||
webServer := web.Start(webAddr, cfg.Server.SSHPort, lobby, db, startTime)
|
||||
_ = webServer // used later for graceful shutdown
|
||||
|
||||
// Create SSH server
|
||||
sshServer, err := server.NewServer(sshAddr, lobby, db)
|
||||
if err != nil {
|
||||
log.Fatalf("Failed to create SSH server: %v", err)
|
||||
}
|
||||
|
||||
// Start backup scheduler
|
||||
backupDone := make(chan struct{})
|
||||
go backupScheduler(db, cfg.Backup, backupDone)
|
||||
|
||||
// Start SSH server in background
|
||||
sshErrCh := make(chan error, 1)
|
||||
go func() {
|
||||
slog.Info("starting SSH server", "addr", sshAddr)
|
||||
sshErrCh <- sshServer.ListenAndServe()
|
||||
}()
|
||||
|
||||
slog.Info("server starting", "ssh_port", cfg.Server.SSHPort, "http_port", cfg.Server.HTTPPort)
|
||||
if err := server.Start(sshAddr, lobby, db); err != nil {
|
||||
log.Fatal(err)
|
||||
|
||||
// Wait for shutdown signal or SSH server error
|
||||
sigCh := make(chan os.Signal, 1)
|
||||
signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
|
||||
|
||||
select {
|
||||
case sig := <-sigCh:
|
||||
slog.Info("shutdown signal received", "signal", sig)
|
||||
case err := <-sshErrCh:
|
||||
if err != nil {
|
||||
slog.Error("SSH server error", "error", err)
|
||||
}
|
||||
}
|
||||
|
||||
// Graceful shutdown
|
||||
slog.Info("starting graceful shutdown")
|
||||
|
||||
// Stop backup scheduler
|
||||
close(backupDone)
|
||||
|
||||
// Shutdown web server (5s timeout)
|
||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||
defer cancel()
|
||||
if err := webServer.Shutdown(ctx); err != nil {
|
||||
slog.Error("web server shutdown error", "error", err)
|
||||
}
|
||||
|
||||
// Shutdown SSH server (10s timeout for active sessions)
|
||||
ctx2, cancel2 := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel2()
|
||||
if err := sshServer.Shutdown(ctx2); err != nil {
|
||||
slog.Error("SSH server shutdown error", "error", err)
|
||||
}
|
||||
|
||||
// Final backup before exit
|
||||
if path, err := db.Backup(cfg.Backup.Dir); err != nil {
|
||||
slog.Error("final backup failed", "error", err)
|
||||
} else {
|
||||
slog.Info("final backup completed", "path", path)
|
||||
}
|
||||
|
||||
slog.Info("server stopped")
|
||||
}
|
||||
|
||||
func backupScheduler(db *store.DB, cfg config.BackupConfig, done chan struct{}) {
|
||||
if cfg.IntervalMin <= 0 {
|
||||
return
|
||||
}
|
||||
ticker := time.NewTicker(time.Duration(cfg.IntervalMin) * time.Minute)
|
||||
defer ticker.Stop()
|
||||
|
||||
for {
|
||||
select {
|
||||
case <-done:
|
||||
return
|
||||
case <-ticker.C:
|
||||
if path, err := db.Backup(cfg.Dir); err != nil {
|
||||
slog.Error("scheduled backup failed", "error", err)
|
||||
} else {
|
||||
slog.Info("scheduled backup completed", "path", path)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user