[PHASE-8] Implement proper graceful shutdown

This commit is contained in:
Savely Krendelhoff 2025-08-23 17:18:22 +07:00
parent f68b055538
commit ad042dd9aa
No known key found for this signature in database
GPG key ID: F70DFD34F40238DE

View file

@ -23,7 +23,7 @@ type TCPServer struct {
listener net.Listener listener net.Listener
logger *slog.Logger logger *slog.Logger
wg sync.WaitGroup wg sync.WaitGroup
shutdown chan struct{} cancel context.CancelFunc
} }
// Option is a functional option for configuring TCPServer // Option is a functional option for configuring TCPServer
@ -44,7 +44,6 @@ func NewTCPServer(wisdomService *service.WisdomService, config *Config, opts ...
wisdomApplication: application.NewWisdomApplication(wisdomService), wisdomApplication: application.NewWisdomApplication(wisdomService),
decoder: protocol.NewMessageDecoder(), decoder: protocol.NewMessageDecoder(),
logger: slog.Default(), logger: slog.Default(),
shutdown: make(chan struct{}),
} }
for _, opt := range opts { for _, opt := range opts {
@ -65,14 +64,22 @@ func (s *TCPServer) Start(ctx context.Context) error {
s.listener = listener s.listener = listener
s.logger.Info("tcp server started", "address", s.config.Address) s.logger.Info("tcp server started", "address", s.config.Address)
go s.acceptLoop(ctx) // Create cancellable context for server lifecycle
serverCtx, cancel := context.WithCancel(ctx)
s.cancel = cancel
go s.acceptLoop(serverCtx)
return nil return nil
} }
// Stop gracefully stops the server // Stop gracefully stops the server
func (s *TCPServer) Stop() error { func (s *TCPServer) Stop() error {
s.logger.Info("stopping tcp server") s.logger.Info("stopping tcp server")
close(s.shutdown)
// Cancel server context to stop accept loop and active connections
if s.cancel != nil {
s.cancel()
}
if s.listener != nil { if s.listener != nil {
s.listener.Close() s.listener.Close()
@ -95,8 +102,6 @@ func (s *TCPServer) Address() string {
func (s *TCPServer) acceptLoop(ctx context.Context) { func (s *TCPServer) acceptLoop(ctx context.Context) {
for { for {
select { select {
case <-s.shutdown:
return
case <-ctx.Done(): case <-ctx.Done():
return return
default: default:
@ -105,7 +110,7 @@ func (s *TCPServer) acceptLoop(ctx context.Context) {
rawConn, err := s.listener.Accept() rawConn, err := s.listener.Accept()
if err != nil { if err != nil {
select { select {
case <-s.shutdown: case <-ctx.Done():
return return
default: default:
s.logger.Error("accept error", sl.Err(err)) s.logger.Error("accept error", sl.Err(err))