fix: can not restart

This commit is contained in:
Hintay 2025-05-04 03:29:50 +09:00
parent 72ee9fdc58
commit 898a315fa7
No known key found for this signature in database
GPG key ID: 120FC7FF121F2F2D

16
main.go
View file

@ -1,12 +1,11 @@
package main
import (
"context"
"crypto/tls"
"fmt"
"net/http"
"context"
"net"
"net/http"
"os/signal"
"syscall"
@ -61,6 +60,7 @@ func Program(confPath string) func(l []net.Listener) error {
srv := &http.Server{
Handler: cRouter.GetEngine(),
}
// defer Shutdown to wait for ongoing requests to be served before returning
defer func(srv *http.Server, ctx context.Context) {
err := srv.Shutdown(ctx)
@ -68,6 +68,7 @@ func Program(confPath string) func(l []net.Listener) error {
logger.Fatal(err)
}
}(srv, context.Background())
var err error
if cSettings.ServerSettings.EnableHTTPS {
// Load TLS certificate
@ -83,20 +84,15 @@ func Program(confPath string) func(l []net.Listener) error {
},
MinVersion: tls.VersionTLS12,
}
srv.TLSConfig = tlsConfig
logger.Info("Starting HTTPS server")
tlsListener := tls.NewListener(listener, tlsConfig)
err = srv.Serve(tlsListener)
return srv.Serve(tlsListener)
} else {
logger.Info("Starting HTTP server")
err = srv.Serve(listener)
return srv.Serve(listener)
}
if err != nil && !errors.Is(err, http.ErrServerClosed) {
logger.Fatalf("listen: %s\n", err)
}
return nil
}
}