0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon: Daemon.initializeNetworking: remove var declaration

Browse source 
The function was declaring an err variable which was shadowed. It was
intended for directly assigning to a struct field, but as this function
is directly mutating an existing object, and the err variable was declared
far away from its use, let's use an intermediate var for that to make it
slightly more atomic.

While at it, also combined two "if" branches.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-07-23 23:28:57 +02:00
parent 12d8029d56
commit a018bb1da7
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
daemon/container_operations.go
View file

@ -948,8 +948,6 @@ func (daemon *Daemon) tryDetachContainerFromClusterNetwork(network *libnetwork.N
}
func (daemon *Daemon) initializeNetworking(cfg *config.Config, container *container.Container) error {
var err error
if container.HostConfig.NetworkMode.IsContainer() {
// we need to get the hosts files from the container to join
nc, err := daemon.getNetworkedContainer(container.ID, container.HostConfig.NetworkMode.ConnectedContainer())
@ -967,13 +965,12 @@ func (daemon *Daemon) initializeNetworking(cfg *config.Config, container *contai
return nil
}
if container.HostConfig.NetworkMode.IsHost() {
if container.Config.Hostname == "" {
container.Config.Hostname, err = os.Hostname()
if err != nil {
return err
}
if container.HostConfig.NetworkMode.IsHost() && container.Config.Hostname == "" {
hn, err := os.Hostname()
if err != nil {
return err
}
container.Config.Hostname = hn
}
if err := daemon.allocateNetwork(cfg, container); err != nil {