kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Initial refactor and cleanup of wwlog

Browse Source
This commit is contained in:
Gregory Kurtzer
2021-10-01 00:28:40 -07:00
parent cb1455bd8b
commit 719de68410
2 changed files with 15 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/pkg/warewulfd/util.go
View File

@@ -36,10 +36,11 @@ func daemonLogf(message string, a ...interface{}) {
} }
log.SetOutput(logwriter) log.SetOutput(logwriter)
loginit = true loginit = true
log.SetFlags(0)
log.SetPrefix("")
} }
log.SetFlags(0)
log.SetPrefix("")
log.Printf(message, a...) log.Printf(message, a...)
} else { } else {

40
internal/pkg/wwlog/wwlog.go
View File

@@ -1,8 +1,8 @@
package wwlog package wwlog
import ( import (
"log" "fmt"
"strings" "os"
) )
const ( const (
@@ -16,55 +16,39 @@ const (
var ( var (
logLevel = INFO logLevel = INFO
Indent string
) )
func SetLevel(level int) { func SetLevel(level int) {
logLevel = level logLevel = level
if level == DEBUG {
log.SetFlags(log.LstdFlags | log.Lmicroseconds | log.Lmsgprefix)
} else {
log.SetFlags(0)
}
Printf(DEBUG, "Set log level to: %d\n", logLevel) Printf(DEBUG, "Set log level to: %d\n", logLevel)
} }
func SetIndent(i int) { func prefixGen(level int) string {
Indent = strings.Repeat(" ", i)
}
func prefixLevel(level int) {
if level == DEBUG { if level == DEBUG {
log.SetPrefix("[DEBUG] " + Indent) return "[DEBUG]"
} else if level == VERBOSE { } else if level == VERBOSE {
log.SetPrefix("[VERBOSE] " + Indent) return "[VERBOSE]"
} else if level == INFO { } else if level == INFO {
log.SetPrefix("[INFO] " + Indent) return "[INFO]"
} else if level == WARN { } else if level == WARN {
log.SetPrefix("[WARN] " + Indent) return "[WARNING]"
} else if level == ERROR { } else if level == ERROR {
log.SetPrefix("[ERROR] " + Indent) return "[ERROR]"
} else if level == CRITICAL { } else if level == CRITICAL {
log.SetPrefix("[CRITICAL] " + Indent) return "[CRITICAL]"
} }
return "[UNDEF]"
} }
func Println(level int, message string) { func Println(level int, message string) {
if level <= logLevel { if level <= logLevel {
prefixLevel(level) fmt.Fprintln(os.Stderr, prefixGen(level)+" "+message)
log.Println(message)
} }
log.SetPrefix("[LOG] " + Indent)
} }
func Printf(level int, message string, a ...interface{}) { func Printf(level int, message string, a ...interface{}) {
if level <= logLevel { if level <= logLevel {
prefixLevel(level) fmt.Fprintf(os.Stderr, prefixGen(level)+" "+message, a...)
log.Printf(message, a...)
} }
log.SetPrefix("[LOG] " + Indent)
} }