Fixed new code for HttpServer. Had to add net.Addr field to the struct to hold addr and network to use in Stop() method.
This commit is contained in:
parent
7915091b96
commit
88b989bfbb
@ -13,6 +13,7 @@ import (
|
|||||||
|
|
||||||
type HttpServer struct {
|
type HttpServer struct {
|
||||||
s http.Server
|
s http.Server
|
||||||
|
addr net.Addr
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewHttpServer(r http.Handler) *HttpServer {
|
func NewHttpServer(r http.Handler) *HttpServer {
|
||||||
@ -26,7 +27,6 @@ func (s *HttpServer) Start(address string) error {
|
|||||||
var network string
|
var network string
|
||||||
if !strings.ContainsRune(address, ':') {
|
if !strings.ContainsRune(address, ':') {
|
||||||
network = "unix"
|
network = "unix"
|
||||||
defer os.Remove(address)
|
|
||||||
} else {
|
} else {
|
||||||
ap, err := netip.ParseAddrPort(address)
|
ap, err := netip.ParseAddrPort(address)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@ -49,6 +49,8 @@ func (s *HttpServer) Start(address string) error {
|
|||||||
os.Chmod(address, 0777)
|
os.Chmod(address, 0777)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
s.addr = listener.Addr()
|
||||||
|
|
||||||
go func() {
|
go func() {
|
||||||
if err = s.s.Serve(listener); err != nil && err != http.ErrServerClosed {
|
if err = s.s.Serve(listener); err != nil && err != http.ErrServerClosed {
|
||||||
log.Fatalln(err)
|
log.Fatalln(err)
|
||||||
@ -62,6 +64,10 @@ func (s *HttpServer) Stop() error {
|
|||||||
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
|
if s.addr.Network() == "unix" {
|
||||||
|
defer os.Remove(s.addr.String())
|
||||||
|
}
|
||||||
|
|
||||||
if err := s.s.Shutdown(ctx); err != nil {
|
if err := s.s.Shutdown(ctx); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user