Skip to content

Commit

Permalink
fix new *lnDepth functions
Browse files Browse the repository at this point in the history
kubernetes#280 added several new functions and
didn't quite get the print vs println difference right: the corresponding
non-Depth functions use fmt.Println and the Depth versions should do the same.
  • Loading branch information
pohly committed Feb 14, 2022
1 parent 2a38bf1 commit 8b58e58
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions klog.go
Expand Up @@ -1615,7 +1615,7 @@ func Warningln(args ...interface{}) {
// WarninglnDepth acts as Warningln but uses depth to determine which call frame to log.
// WarninglnDepth(0, "msg") is the same as Warningln("msg").
func WarninglnDepth(depth int, args ...interface{}) {
logging.printDepth(warningLog, logging.logr, logging.filter, depth, args...)
logging.printlnDepth(warningLog, logging.logr, logging.filter, depth, args...)
}

// Warningf logs to the WARNING and INFO logs.
Expand Down Expand Up @@ -1651,7 +1651,7 @@ func Errorln(args ...interface{}) {
// ErrorlnDepth acts as Errorln but uses depth to determine which call frame to log.
// ErrorlnDepth(0, "msg") is the same as Errorln("msg").
func ErrorlnDepth(depth int, args ...interface{}) {
logging.printDepth(errorLog, logging.logr, logging.filter, depth, args...)
logging.printlnDepth(errorLog, logging.logr, logging.filter, depth, args...)
}

// Errorf logs to the ERROR, WARNING, and INFO logs.
Expand Down Expand Up @@ -1708,7 +1708,7 @@ func Fatalln(args ...interface{}) {
// FatallnDepth acts as Fatalln but uses depth to determine which call frame to log.
// FatallnDepth(0, "msg") is the same as Fatalln("msg").
func FatallnDepth(depth int, args ...interface{}) {
logging.printDepth(fatalLog, logging.logr, logging.filter, depth, args...)
logging.printlnDepth(fatalLog, logging.logr, logging.filter, depth, args...)
}

// Fatalf logs to the FATAL, ERROR, WARNING, and INFO logs,
Expand Down Expand Up @@ -1752,7 +1752,7 @@ func Exitln(args ...interface{}) {
// ExitlnDepth(0, "msg") is the same as Exitln("msg").
func ExitlnDepth(depth int, args ...interface{}) {
atomic.StoreUint32(&fatalNoStacks, 1)
logging.printDepth(fatalLog, logging.logr, logging.filter, depth, args...)
logging.printlnDepth(fatalLog, logging.logr, logging.filter, depth, args...)
}

// Exitf logs to the FATAL, ERROR, WARNING, and INFO logs, then calls os.Exit(1).
Expand Down
4 changes: 2 additions & 2 deletions test/output.go
Expand Up @@ -499,7 +499,7 @@ I output.go:<LINE>] "test" firstKey=1 secondKey=3
{
name: "WarninglnDepth",
logFunc: func() { klog.WarninglnDepth(0, "hello", "world") },
output: "W output.go:<LINE>] helloworld\n", // BUG
output: "W output.go:<LINE>] hello world\n",
},
{
name: "Warningf",
Expand Down Expand Up @@ -529,7 +529,7 @@ I output.go:<LINE>] "test" firstKey=1 secondKey=3
{
name: "ErrorlnDepth",
logFunc: func() { klog.ErrorlnDepth(0, "hello", "world") },
output: "E output.go:<LINE>] helloworld\n", // BUG
output: "E output.go:<LINE>] hello world\n",
},
{
name: "Errorf",
Expand Down

0 comments on commit 8b58e58

Please sign in to comment.