7e7b01fa31
pkg/kubectl/util/logs & staging/src/k8s.io/apiserver/pkg/util/logs use `glog.info(...)` but this function is not made to be wrapped because the underlying mechanism use a fixed call trace length to determine where the log has been emited. This results is having `logs.go:49` in the logs which is in the body of the wrapper function and thus useless. Instead use `glog.infoDepth(1, ...)` which tells the underlying mechanism to go back 1 more level in the call trace to determine where the log has been emitted. Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
62 lines
1.7 KiB
Go
62 lines
1.7 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package logs
|
|
|
|
import (
|
|
"flag"
|
|
"log"
|
|
"time"
|
|
|
|
"github.com/golang/glog"
|
|
"github.com/spf13/pflag"
|
|
"k8s.io/apimachinery/pkg/util/wait"
|
|
)
|
|
|
|
var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum number of seconds between log flushes")
|
|
|
|
// TODO(thockin): This is temporary until we agree on log dirs and put those into each cmd.
|
|
func init() {
|
|
flag.Set("logtostderr", "true")
|
|
}
|
|
|
|
// GlogWriter serves as a bridge between the standard log package and the glog package.
|
|
type GlogWriter struct{}
|
|
|
|
// Write implements the io.Writer interface.
|
|
func (writer GlogWriter) Write(data []byte) (n int, err error) {
|
|
glog.InfoDepth(1, string(data))
|
|
return len(data), nil
|
|
}
|
|
|
|
// InitLogs initializes logs the way we want for kubernetes.
|
|
func InitLogs() {
|
|
log.SetOutput(GlogWriter{})
|
|
log.SetFlags(0)
|
|
// The default glog flush interval is 5 seconds.
|
|
go wait.Until(glog.Flush, *logFlushFreq, wait.NeverStop)
|
|
}
|
|
|
|
// FlushLogs flushes logs immediately.
|
|
func FlushLogs() {
|
|
glog.Flush()
|
|
}
|
|
|
|
// NewLogger creates a new log.Logger which sends logs to glog.Info.
|
|
func NewLogger(prefix string) *log.Logger {
|
|
return log.New(GlogWriter{}, prefix, 0)
|
|
}
|