lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

engine: resources: Mask normal closing error

Browse Source 
This could possibly be fixed upstream, but we'll workaround it for now.
This commit is contained in:
James Shubin
2023-11-22 22:11:50 -05:00
parent c6c0d3d420
commit 04d54e8d82
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/resources/dhcp.go
View File

@@ -19,6 +19,7 @@ package resources
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"net" "net"
"net/url" "net/url"
@@ -449,7 +450,10 @@ func (obj *DHCPServerRes) Watch(ctx context.Context) error {
defer close(closeSignal) defer close(closeSignal)
err := server.Serve() // blocks until Close() is called I hope! err := server.Serve() // blocks until Close() is called I hope!
if err == nil { // TODO: getting this error is probably a bug, please see:
// https://github.com/insomniacslk/dhcp/issues/376
isClosing := errors.Is(err, net.ErrClosed)
if err == nil || isClosing {
return return
} }
// if this returned on its own, then closeSignal can be used... // if this returned on its own, then closeSignal can be used...