engine: resources: net: Clean up weird error handling
Not sure how this happened.
This commit is contained in:
@@ -188,16 +188,15 @@ func (obj *NetRes) Init(init *engine.Init) error {
|
|||||||
|
|
||||||
// Close cleans up when we're done.
|
// Close cleans up when we're done.
|
||||||
func (obj *NetRes) Close() error {
|
func (obj *NetRes) Close() error {
|
||||||
var errList error
|
|
||||||
|
|
||||||
if obj.socketFile == "/" {
|
if obj.socketFile == "/" {
|
||||||
return fmt.Errorf("socket file should not be the root path")
|
return fmt.Errorf("socket file should not be the root path")
|
||||||
}
|
}
|
||||||
if obj.socketFile != "" { // safety
|
if obj.socketFile != "" { // safety
|
||||||
errList = errwrap.Append(errList, os.Remove(obj.socketFile))
|
if err := os.Remove(obj.socketFile); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
return errList
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Watch listens for events from the specified interface via a netlink socket.
|
// Watch listens for events from the specified interface via a netlink socket.
|
||||||
|
|||||||
Reference in New Issue
Block a user