From 219f9dd417a4ef56932aa42d789fa0b33ca10b39 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 21 Jul 2016 11:39:22 -0400 Subject: [PATCH] Add V(5) logging back to pkg/util/ovs and pkg/util/ipcmd They used to get logging via the old openshift-sdn pkg/exec, but kexec doesn't log anything. --- pkg/util/ipcmd/ipcmd.go | 6 ++++++ pkg/util/ovs/ovs.go | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/pkg/util/ipcmd/ipcmd.go b/pkg/util/ipcmd/ipcmd.go index ab6bb3e18ff2..ef7a0cc18745 100644 --- a/pkg/util/ipcmd/ipcmd.go +++ b/pkg/util/ipcmd/ipcmd.go @@ -6,6 +6,8 @@ import ( "regexp" "strings" + "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util/exec" ) @@ -39,8 +41,12 @@ func (tx *Transaction) exec(args []string) (string, error) { return "", tx.err } + glog.V(5).Infof("Executing: %s %s", ipcmdPath, strings.Join(args, " ")) var output []byte output, tx.err = tx.execer.Command(ipcmdPath, args...).CombinedOutput() + if tx.err != nil { + glog.V(5).Infof("Error executing %s: %s", ipcmdPath, string(output)) + } return string(output), tx.err } diff --git a/pkg/util/ovs/ovs.go b/pkg/util/ovs/ovs.go index e9437749bf62..d61630ccd8b2 100644 --- a/pkg/util/ovs/ovs.go +++ b/pkg/util/ovs/ovs.go @@ -5,6 +5,8 @@ import ( "fmt" "strings" + "github.com/golang/glog" + "k8s.io/kubernetes/pkg/util/exec" ) @@ -32,8 +34,12 @@ func (tx *Transaction) exec(cmd string, args ...string) (string, error) { return "", tx.err } + glog.V(5).Infof("Executing: %s %s", cmdpath, strings.Join(args, " ")) var output []byte output, tx.err = tx.execer.Command(cmdpath, args...).CombinedOutput() + if tx.err != nil { + glog.V(5).Infof("Error executing %s: %s", cmdpath, string(output)) + } return string(output), tx.err }