InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

daemon/libnetwork: Sandbox.EnableService/DisableService slight cleanup

Browse Source 
- remove/rename named error-return
- remove redundant defer
- use "continue" to reduce nesting
- use structured logs

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2025-08-01 19:34:03 +02:00
parent c6ca504388
commit 77c2e3279d
1 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
daemon/libnetwork/sandbox.go
View File

@@ -516,12 +516,16 @@ func (sb *Sandbox) hasExternalAccess() bool {
// EnableService makes a managed container's service available by adding the
// endpoint to the service load balancer and service discovery.
func (sb *Sandbox) EnableService() (err error) {
log.G(context.TODO()).Debugf("EnableService %s START", sb.containerID)
func (sb *Sandbox) EnableService() (retErr error) {
log.G(context.TODO()).WithField("container", sb.containerID).Debug("EnableService START")
defer func() {
if err != nil {
if err2 := sb.DisableService(); err2 != nil {
log.G(context.TODO()).WithError(err2).WithField("origError", err).Error("Error while disabling service after original error")
if retErr != nil {
if err := sb.DisableService(); err != nil {
log.G(context.TODO()).WithFields(log.Fields{
"error": err,
"origError": retErr,
"container": sb.containerID,
}).Error("Error while disabling service after original error")
}
}
}()
@@ -533,30 +537,33 @@ func (sb *Sandbox) EnableService() (err error) {
ep.enableService()
}
}
log.G(context.TODO()).Debugf("EnableService %s DONE", sb.containerID)
log.G(context.TODO()).WithField("container", sb.containerID).Debug("EnableService DONE")
return nil
}
// DisableService removes a managed container's endpoints from the load balancer
// and service discovery.
func (sb *Sandbox) DisableService() (err error) {
log.G(context.TODO()).Debugf("DisableService %s START", sb.containerID)
failedEps := []string{}
defer func() {
if len(failedEps) > 0 {
err = fmt.Errorf("failed to disable service on sandbox:%s, for endpoints %s", sb.ID(), strings.Join(failedEps, ","))
}
}()
func (sb *Sandbox) DisableService() error {
log.G(context.TODO()).WithField("container", sb.containerID).Debug("DisableService START")
var failedEps []string
for _, ep := range sb.Endpoints() {
if ep.isServiceEnabled() {
if err := ep.deleteServiceInfoFromCluster(sb, false, "DisableService"); err != nil {
failedEps = append(failedEps, ep.Name())
log.G(context.TODO()).Warnf("failed update state for endpoint %s into cluster: %v", ep.Name(), err)
}
ep.disableService()
if !ep.isServiceEnabled() {
continue
}
if err := ep.deleteServiceInfoFromCluster(sb, false, "DisableService"); err != nil {
failedEps = append(failedEps, ep.Name())
log.G(context.TODO()).WithFields(log.Fields{
"container": sb.containerID,
"error": err,
"ep": ep.Name(),
}).Warn("failed to update state for endpoint into cluster")
}
ep.disableService()
}
log.G(context.TODO()).WithField("container", sb.containerID).Debug("DisableService DONE")
if len(failedEps) > 0 {
return fmt.Errorf("failed to disable service on sandbox:%s, for endpoints %s", sb.ID(), strings.Join(failedEps, ","))
}
log.G(context.TODO()).Debugf("DisableService %s DONE", sb.containerID)
return nil
}