Register Kubernetes log package early

kylape · Sep 16, 2016 · ac04088 · ac04088
1 parent 3de3eec
commit ac04088
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/cmd/dockerregistry/main.go b/cmd/dockerregistry/main.go
@@ -9,6 +9,8 @@ import (
 	"runtime"
 
 	log "github.com/Sirupsen/logrus"
+	"k8s.io/kubernetes/pkg/util/logs"
+
 	"github.com/openshift/origin/pkg/cmd/dockerregistry"
 	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/serviceability"
@@ -20,6 +22,8 @@ import (
 )
 
 func main() {
+	logs.InitLogs()
+	defer logs.FlushLogs()
 	defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
 	defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
 	startProfiler()

diff --git a/cmd/gitserver/gitserver.go b/cmd/gitserver/gitserver.go
@@ -5,6 +5,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"k8s.io/kubernetes/pkg/util/logs"
+
 	"github.com/openshift/origin/pkg/cmd/infra/gitserver"
 	"github.com/openshift/origin/pkg/cmd/util/serviceability"
 
@@ -15,6 +17,8 @@ import (
 )
 
 func main() {
+	logs.InitLogs()
+	defer logs.FlushLogs()
 	defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
 	defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
 

diff --git a/cmd/oc/oc.go b/cmd/oc/oc.go
@@ -5,6 +5,8 @@ import (
 	"path/filepath"
 	"runtime"
 
+	"k8s.io/kubernetes/pkg/util/logs"
+
 	"github.com/openshift/origin/pkg/cmd/cli"
 	"github.com/openshift/origin/pkg/cmd/util/serviceability"
 
@@ -17,6 +19,8 @@ import (
 )
 
 func main() {
+	logs.InitLogs()
+	defer logs.FlushLogs()
 	defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
 	defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
 

diff --git a/cmd/openshift/openshift.go b/cmd/openshift/openshift.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/golang/glog"
+	"k8s.io/kubernetes/pkg/util/logs"
 
 	"github.com/openshift/origin/pkg/cmd/openshift"
 	"github.com/openshift/origin/pkg/cmd/util/serviceability"
@@ -19,11 +19,11 @@ import (
 )
 
 func main() {
+	logs.InitLogs()
+	defer logs.FlushLogs()
 	defer serviceability.BehaviorOnPanic(os.Getenv("OPENSHIFT_ON_PANIC"))()
 	defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()
 
-	glog.CopyStandardLogTo("INFO")
-
 	if len(os.Getenv("GOMAXPROCS")) == 0 {
 		runtime.GOMAXPROCS(runtime.NumCPU())
 	}