cleanup unneeded if block
This commit is contained in:
parent
8aea674681
commit
2f1284bc34
@ -204,18 +204,16 @@ func NewCgroupManager(cs *CgroupSubsystems, cgroupDriver string) CgroupManager {
|
||||
func (m *cgroupManagerImpl) Name(name CgroupName) string {
|
||||
if m.adapter.cgroupManagerType == libcontainerSystemd {
|
||||
return name.ToSystemd()
|
||||
} else {
|
||||
return name.ToCgroupfs()
|
||||
}
|
||||
return name.ToCgroupfs()
|
||||
}
|
||||
|
||||
// CgroupName converts the literal cgroupfs name on the host to an internal identifier.
|
||||
func (m *cgroupManagerImpl) CgroupName(name string) CgroupName {
|
||||
if m.adapter.cgroupManagerType == libcontainerSystemd {
|
||||
return ParseSystemdToCgroupName(name)
|
||||
} else {
|
||||
return ParseCgroupfsToCgroupName(name)
|
||||
}
|
||||
return ParseCgroupfsToCgroupName(name)
|
||||
}
|
||||
|
||||
// buildCgroupPaths builds a path to each cgroup subsystem for the specified name.
|
||||
|
@ -136,9 +136,8 @@ func (m *podContainerManagerImpl) killOnePid(pid int) error {
|
||||
// also does this.
|
||||
glog.V(3).Infof("process with pid %v no longer exists", pid)
|
||||
return nil
|
||||
} else {
|
||||
return err
|
||||
}
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user