kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add one call depth to compensate for log pkg

This commit is contained in:
Tim Hockin 2021-08-16 23:45:10 -07:00
parent dc02fd98c0
commit 0ea10cbbc2
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/logging/logging.go
View File

@ -29,24 +29,19 @@ import (
// Logger provides a logging interface. // Logger provides a logging interface.
type Logger struct { type Logger struct {
log logr.Logger logr.Logger
root string root string
errorFile string errorFile string
} }
// New returns a Logger, with the same API as logr.Logger. // New returns a Logger, with the same API as logr.Logger.
func New(root string, errorFile string) *Logger { func New(root string, errorFile string) *Logger {
return &Logger{log: glogr.New(), root: root, errorFile: errorFile} return &Logger{Logger: glogr.New(), root: root, errorFile: errorFile}
}
// Info implements logr.Logger.Info.
func (l *Logger) Info(msg string, keysAndValues ...interface{}) {
l.log.Info(msg, keysAndValues...)
} }
// Error implements logr.Logger.Error. // Error implements logr.Logger.Error.
func (l *Logger) Error(err error, msg string, kvList ...interface{}) { func (l *Logger) Error(err error, msg string, kvList ...interface{}) {
l.log.Error(err, msg, kvList...) l.Logger.WithCallDepth(1).Error(err, msg, kvList...)
if l.errorFile == "" { if l.errorFile == "" {
return return
} }
@ -71,7 +66,7 @@ func (l *Logger) Error(err error, msg string, kvList ...interface{}) {
} }
jb, err := json.Marshal(payload) jb, err := json.Marshal(payload)
if err != nil { if err != nil {
l.log.Error(err, "can't encode error payload") l.Logger.Error(err, "can't encode error payload")
content := fmt.Sprintf("%v", err) content := fmt.Sprintf("%v", err)
l.writeContent([]byte(content)) l.writeContent([]byte(content))
} else { } else {
@ -79,21 +74,6 @@ func (l *Logger) Error(err error, msg string, kvList ...interface{}) {
} }
} }
// V implements logr.Logger.V.
func (l *Logger) V(level int) logr.Logger {
return l.log.V(level)
}
// WithValues implements logr.Logger.WithValues.
func (l *Logger) WithValues(keysAndValues ...interface{}) logr.Logger {
return l.log.WithValues(keysAndValues...)
}
// WithName implements logr.Logger.WithName.
func (l *Logger) WithName(name string) logr.Logger {
return l.log.WithName(name)
}
// ExportError exports the error to the error file if --export-error is enabled. // ExportError exports the error to the error file if --export-error is enabled.
func (l *Logger) ExportError(content string) { func (l *Logger) ExportError(content string) {
if l.errorFile == "" { if l.errorFile == "" {
@ -112,7 +92,7 @@ func (l *Logger) DeleteErrorFile() {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return return
} }
l.log.Error(err, "can't delete the error-file", "filename", errorFile) l.Logger.Error(err, "can't delete the error-file", "filename", errorFile)
} }
} }
@ -121,32 +101,32 @@ func (l *Logger) writeContent(content []byte) {
if _, err := os.Stat(l.root); os.IsNotExist(err) { if _, err := os.Stat(l.root); os.IsNotExist(err) {
fileMode := os.FileMode(0755) fileMode := os.FileMode(0755)
if err := os.Mkdir(l.root, fileMode); err != nil { if err := os.Mkdir(l.root, fileMode); err != nil {
l.log.Error(err, "can't create the root directory", "root", l.root) l.Logger.Error(err, "can't create the root directory", "root", l.root)
return return
} }
} }
tmpFile, err := ioutil.TempFile(l.root, "tmp-err-") tmpFile, err := ioutil.TempFile(l.root, "tmp-err-")
if err != nil { if err != nil {
l.log.Error(err, "can't create temporary error-file", "directory", l.root, "prefix", "tmp-err-") l.Logger.Error(err, "can't create temporary error-file", "directory", l.root, "prefix", "tmp-err-")
return return
} }
defer func() { defer func() {
if err := tmpFile.Close(); err != nil { if err := tmpFile.Close(); err != nil {
l.log.Error(err, "can't close temporary error-file", "filename", tmpFile.Name()) l.Logger.Error(err, "can't close temporary error-file", "filename", tmpFile.Name())
} }
}() }()
if _, err = tmpFile.Write(content); err != nil { if _, err = tmpFile.Write(content); err != nil {
l.log.Error(err, "can't write to temporary error-file", "filename", tmpFile.Name()) l.Logger.Error(err, "can't write to temporary error-file", "filename", tmpFile.Name())
return return
} }
errorFile := filepath.Join(l.root, l.errorFile) errorFile := filepath.Join(l.root, l.errorFile)
if err := os.Rename(tmpFile.Name(), errorFile); err != nil { if err := os.Rename(tmpFile.Name(), errorFile); err != nil {
l.log.Error(err, "can't rename to error-file", "temp-file", tmpFile.Name(), "error-file", errorFile) l.Logger.Error(err, "can't rename to error-file", "temp-file", tmpFile.Name(), "error-file", errorFile)
return return
} }
if err := os.Chmod(errorFile, 0644); err != nil { if err := os.Chmod(errorFile, 0644); err != nil {
l.log.Error(err, "can't change permissions on the error-file", "error-file", errorFile) l.Logger.Error(err, "can't change permissions on the error-file", "error-file", errorFile)
} }
} }