Merge pull request #8024 from stevekuznetsov/skuznets/glog

Merged by openshift-bot
openshift · May 2, 2016 · b50fa54 · b50fa54
2 parents d33c8ab + 5963a5c
commit b50fa54
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 5 deletions.
diff --git a/Godeps/_workspace/src/github.com/golang/glog/glog.go b/Godeps/_workspace/src/github.com/golang/glog/glog.go
diff --git a/pkg/cmd/server/start/start_allinone.go b/pkg/cmd/server/start/start_allinone.go
@@ -34,6 +34,7 @@ type AllInOneOptions struct {
 	NodeConfigFile     string
 	PrintIP            bool
 	ServiceNetworkCIDR string
+	Output             io.Writer
 }
 
 const allInOneLong = `
@@ -59,7 +60,7 @@ You may also pass --kubeconfig=<path> to connect to an external Kubernetes clust
 
 // NewCommandStartAllInOne provides a CLI handler for 'start' command
 func NewCommandStartAllInOne(basename string, out io.Writer) (*cobra.Command, *AllInOneOptions) {
-	options := &AllInOneOptions{MasterOptions: &MasterOptions{Output: out}}
+	options := &AllInOneOptions{Output: out, MasterOptions: &MasterOptions{Output: out}}
 	options.MasterOptions.DefaultsFromName(basename)
 
 	cmds := &cobra.Command{
@@ -227,7 +228,7 @@ func (o AllInOneOptions) StartAllInOne() error {
 		if err != nil {
 			return err
 		}
-		fmt.Fprintf(o.MasterOptions.Output, "%s\n", host)
+		fmt.Fprintf(o.Output, "%s\n", host)
 		return nil
 	}
 	masterOptions := *o.MasterOptions

diff --git a/pkg/cmd/server/start/start_master.go b/pkg/cmd/server/start/start_master.go
@@ -318,7 +318,7 @@ func (o MasterOptions) CreateCerts() error {
 		APIServerCAFiles:   o.MasterArgs.APIServerCAFiles,
 		CABundleFile:       admin.DefaultCABundleFile(o.MasterArgs.ConfigDir.Value()),
 		PublicAPIServerURL: publicMasterAddr.String(),
-		Output:             o.Output,
+		Output:             cmdutil.NewGLogWriterV(3),
 	}
 	if err := mintAllCertsOptions.Validate(nil); err != nil {
 		return err

diff --git a/pkg/cmd/server/start/start_node.go b/pkg/cmd/server/start/start_node.go
@@ -19,6 +19,7 @@ import (
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	configapilatest "github.com/openshift/origin/pkg/cmd/server/api/latest"
 	"github.com/openshift/origin/pkg/cmd/server/api/validation"
+	cmdutil "github.com/openshift/origin/pkg/cmd/util"
 	"github.com/openshift/origin/pkg/cmd/util/docker"
 	utilflags "github.com/openshift/origin/pkg/cmd/util/flags"
 	"github.com/openshift/origin/pkg/version"
@@ -257,7 +258,7 @@ func (o NodeOptions) CreateNodeConfig() error {
 		APIServerCAFiles: []string{admin.DefaultCABundleFile(o.NodeArgs.MasterCertDir)},
 
 		NodeClientCAFile: getSignerOptions.CertFile,
-		Output:           o.Output,
+		Output:           cmdutil.NewGLogWriterV(3),
 	}
 
 	if err := createNodeConfigOptions.Validate(nil); err != nil {

diff --git a/pkg/cmd/util/log.go b/pkg/cmd/util/log.go
@@ -1,6 +1,10 @@
 package util
 
-import "github.com/golang/glog"
+import (
+	"io"
+
+	"github.com/golang/glog"
+)
 
 // GetLogLevel returns the current glog log level
 func GetLogLevel() (level int) {
@@ -11,3 +15,23 @@ func GetLogLevel() (level int) {
 	}
 	return
 }
+
+// NewGLogWriterV returns a new Writer that delegates to `glog.Info` at the
+// desired level of verbosity
+func NewGLogWriterV(level int) io.Writer {
+	return &gLogWriter{
+		level: glog.Level(level),
+	}
+}
+
+// gLogWriter is a Writer that writes by delegating to `glog.Info`
+type gLogWriter struct {
+	// level is the default level to log at
+	level glog.Level
+}
+
+func (w *gLogWriter) Write(p []byte) (n int, err error) {
+	glog.V(w.level).InfoDepth(2, string(p))
+
+	return len(p), nil
+}