github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20953 from yujuhong/log_error

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-21 02:45:23 -08:00
commit 6d0e57b711
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/kubelet/app/server.go
View File

@ -263,7 +263,14 @@ func UnsecuredKubeletConfig(s *options.KubeletServer) (*KubeletConfig, error) {
// Otherwise, the caller is assumed to have set up the KubeletConfig object and all defaults // Otherwise, the caller is assumed to have set up the KubeletConfig object and all defaults
// will be ignored. // will be ignored.
func Run(s *options.KubeletServer, kcfg *KubeletConfig) error { func Run(s *options.KubeletServer, kcfg *KubeletConfig) error {
var err error err := run(s, kcfg)
if err != nil {
glog.Errorf("Failed running kubelet: %v", err)
}
return err
}
func run(s *options.KubeletServer, kcfg *KubeletConfig) (err error) {
if s.LockFilePath != "" { if s.LockFilePath != "" {
glog.Infof("aquiring lock on %q", s.LockFilePath) glog.Infof("aquiring lock on %q", s.LockFilePath)
if err := flock.Acquire(s.LockFilePath); err != nil { if err := flock.Acquire(s.LockFilePath); err != nil {