From f9e3030268bd2a2653f61d36c10af9e8f0717bbf Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Wed, 8 Oct 2025 14:29:32 +0900 Subject: [PATCH] fixed a nil check issue --- client.go | 2 +- cmd/main.go | 1 + server.go | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/client.go b/client.go index 52d31d9..6ee48c8 100644 --- a/client.go +++ b/client.go @@ -2721,7 +2721,7 @@ func (c *Client) run_single_ctl_server(i int, cs *http.Server, wg *sync.WaitGrou } else { err = fmt.Errorf("stop requested") } - if errors.Is(err, http.ErrServerClosed) { + if err == nil || errors.Is(err, http.ErrServerClosed) { c.log.Write("", LOG_INFO, "Control channel[%d] ended", i) } else { c.log.Write("", LOG_ERROR, "Control channel[%d] error - %s", i, err.Error()) diff --git a/cmd/main.go b/cmd/main.go index 064d03a..e364d6c 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -63,6 +63,7 @@ chan_loop: //signal.Reset(syscall.SIGTERM) signal.Stop(sighup_chan) signal.Stop(sigterm_chan) + signal.Ignore(syscall.SIGHUP, syscall.SIGTERM, os.Interrupt) } func (sh *signal_handler) StartService(data interface{}) { diff --git a/server.go b/server.go index 4c36279..ef896e4 100644 --- a/server.go +++ b/server.go @@ -2092,7 +2092,7 @@ func (s* Server) run_single_ctl_server(i int, cs *http.Server, wg* sync.WaitGrou } else { err = fmt.Errorf("stop requested") } - if errors.Is(err, http.ErrServerClosed) { + if err == nil || errors.Is(err, http.ErrServerClosed) { s.log.Write("", LOG_INFO, "Control channel[%d] ended", i) } else { s.log.Write("", LOG_ERROR, "Control channel[%d] error - %s", i, err.Error()) @@ -2148,7 +2148,7 @@ func (s *Server) run_single_rpx_server(i int, cs *http.Server, wg* sync.WaitGrou } else { err = fmt.Errorf("stop requested") } - if errors.Is(err, http.ErrServerClosed) { + if err == nil || errors.Is(err, http.ErrServerClosed) { s.log.Write("", LOG_INFO, "RPX channel[%d] ended", i) } else { s.log.Write("", LOG_ERROR, "RPX channel[%d] error - %s", i, err.Error()) @@ -2205,7 +2205,7 @@ func (s *Server) run_single_pxy_server(i int, cs *http.Server, wg* sync.WaitGrou } else { err = fmt.Errorf("stop requested") } - if errors.Is(err, http.ErrServerClosed) { + if err == nil || errors.Is(err, http.ErrServerClosed) { s.log.Write("", LOG_INFO, "Proxy channel[%d] ended", i) } else { s.log.Write("", LOG_ERROR, "Proxy channel[%d] error - %s", i, err.Error()) @@ -2261,7 +2261,7 @@ func (s *Server) run_single_wpx_server(i int, cs *http.Server, wg* sync.WaitGrou } else { err = fmt.Errorf("stop requested") } - if errors.Is(err, http.ErrServerClosed) { + if err == nil || errors.Is(err, http.ErrServerClosed) { s.log.Write("", LOG_INFO, "Wpx channel[%d] ended", i) } else { s.log.Write("", LOG_ERROR, "Wpx channel[%d] error - %s", i, err.Error())