hyung-hwan/hodu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added a stop request guard in starting a control channel

Browse Source
This commit is contained in:
hyung-hwan 2024-12-09 17:23:26 +09:00
parent f1c146d94f
commit 464a550c68
2 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
client.go
View File

@ -1268,20 +1268,38 @@ func (c *Client) RunCtlTask(wg *sync.WaitGroup) {
// by creating the listener explicitly. // by creating the listener explicitly.
// err = cs.ListenAndServe() // err = cs.ListenAndServe()
// err = cs.ListenAndServeTLS("", "") // c.tlscfg must provide a certificate and a key // err = cs.ListenAndServeTLS("", "") // c.tlscfg must provide a certificate and a key
l, err = net.Listen(tcp_addr_str_class(cs.Addr), cs.Addr)
if err == nil { //cs.shuttingDown(), as the name indicates, is not expoosed by the net/http
if c.ctltlscfg == nil { //so I have to use my own indicator to check if it's been shutdown..
err = cs.Serve(l) //
} else { if c.stop_req.Load() == false {
err = cs.ServeTLS(l, "", "") // c.ctltlscfg must provide a certificate and a key // this guard has a flaw in that the stop request can be made
// between the check above and net.Listen() below.
l, err = net.Listen(tcp_addr_str_class(cs.Addr), cs.Addr)
if err == nil {
if c.stop_req.Load() == false {
// check it again to make the guard slightly more stable
// although it's still possible that the stop request is made
// after Listen()
if c.ctltlscfg == nil {
err = cs.Serve(l)
} else {
err = cs.ServeTLS(l, "", "") // c.ctltlscfg must provide a certificate and a key
}
} else {
err = fmt.Errorf("stop requested")
}
l.Close()
} }
l.Close() } else {
err = fmt.Errorf("stop requested")
} }
if errors.Is(err, http.ErrServerClosed) { if errors.Is(err, http.ErrServerClosed) {
c.log.Write("", LOG_INFO, "Control channel[%d] ended", i) c.log.Write("", LOG_INFO, "Control channel[%d] ended", i)
} else { } else {
c.log.Write("", LOG_ERROR, "Control channel[%d] error - %s", i, err.Error()) c.log.Write("", LOG_ERROR, "Control channel[%d] error - %s", i, err.Error())
} }
l_wg.Done() l_wg.Done()
}(idx, ctl) }(idx, ctl)
} }

29
server.go
View File

@ -1020,17 +1020,26 @@ func (s *Server) RunCtlTask(wg *sync.WaitGroup) {
s.log.Write("", LOG_INFO, "Control channel[%d] started on %s", i, s.ctl_addr[i]) s.log.Write("", LOG_INFO, "Control channel[%d] started on %s", i, s.ctl_addr[i])
// defeat hard-coded "tcp" in ListenAndServe() and ListenAndServeTLS()
// err = cs.ListenAndServe() if s.stop_req.Load() == false {
// err = cs.ListenAndServeTLS("", "") // defeat hard-coded "tcp" in ListenAndServe() and ListenAndServeTLS()
l, err = net.Listen(tcp_addr_str_class(cs.Addr), cs.Addr) // err = cs.ListenAndServe()
if err == nil { // err = cs.ListenAndServeTLS("", "")
if s.ctltlscfg == nil { l, err = net.Listen(tcp_addr_str_class(cs.Addr), cs.Addr)
err = cs.Serve(l) if err == nil {
} else { if s.stop_req.Load() == false {
err = cs.ServeTLS(l, "", "") // s.ctltlscfg must provide a certificate and a key if s.ctltlscfg == nil {
err = cs.Serve(l)
} else {
err = cs.ServeTLS(l, "", "") // s.ctltlscfg must provide a certificate and a key
}
} else {
err = fmt.Errorf("stop requested")
}
l.Close()
} }
l.Close() } else {
err = fmt.Errorf("stop requested")
} }
if errors.Is(err, http.ErrServerClosed) { if errors.Is(err, http.ErrServerClosed) {
s.log.Write("", LOG_INFO, "Control channel[%d] ended", i) s.log.Write("", LOG_INFO, "Control channel[%d] ended", i)