From 6a34d7be01256df472015564a655d8253acd8724 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Wed, 27 Nov 2024 12:52:22 +0200 Subject: Refactored server infrastructure --- cmd/server/main.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'cmd') diff --git a/cmd/server/main.go b/cmd/server/main.go index 0359ff8..6ac03ea 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -11,6 +11,7 @@ import ( "github.com/kyren223/eko/internal/server" "github.com/kyren223/eko/internal/server/api" + "github.com/kyren223/eko/pkg/assert" ) const port = 7223 @@ -32,11 +33,11 @@ func main() { } api.ConnectToDatabase() - defer api.CloseDatabase() - - server := server.NewServer(port) + assert.AddFlush(api.DB()) + defer api.DB().Close() ctx, cancel := context.WithCancel(context.Background()) + defer cancel() signalChan := make(chan os.Signal, 1) signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM) go func() { @@ -45,5 +46,8 @@ func main() { cancel() }() - server.ListenAndServe(ctx) + server := server.NewServer(port) + if err := server.Run(ctx); err != nil { + log.Println(err) + } } -- cgit v1.3.1