ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-22 20:41:40 +02:00
Code Issues Packages Releases Activity

Fix return error, fix wrong log path, add notice log where applicable

Browse Source 
- Adresses issue #26
This commit is contained in:
Christoph Kluge
2023-01-24 12:02:29 +01:00
parent 79a949b55e
commit bd770d0e32
6 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
pkg/log/log.go
View File

@@ -97,6 +97,8 @@ func printStr(v ...interface{}) string {
return fmt.Sprint(v...)
}
// Uses Info() -> If errorpath required at some point:
// Will need own writer with 'Output(2, out)' to correctly render path
func Print(v ...interface{}) {
Info(v...)
}
@@ -156,17 +158,20 @@ func Error(v ...interface{}) {
}
}
// Writes panic stacktrace, keeps application alive
// Writes panic stacktrace, but keeps application alive
func Panic(v ...interface{}) {
Error(v...)
if ErrWriter != io.Discard {
out := printStr(v...)
if logDateTime {
ErrTimeLog.Output(2, out)
} else {
ErrLog.Output(2, out)
}
}
panic("Panic triggered ...")
}
// Writes error log, stops application
func Fatal(v ...interface{}) {
Error(v...)
os.Exit(1)
}
func Crit(v ...interface{}) {
if CritWriter != io.Discard {
@@ -179,6 +184,20 @@ func Crit(v ...interface{}) {
}
}
// Writes critical log, stops application
func Fatal(v ...interface{}) {
if CritWriter != io.Discard {
out := printStr(v...)
if logDateTime {
CritTimeLog.Output(2, out)
} else {
CritLog.Output(2, out)
}
}
os.Exit(1)
}
/* PRINT FORMAT*/
// Private helper
@@ -186,6 +205,8 @@ func printfStr(format string, v ...interface{}) string {
return fmt.Sprintf(format, v...)
}
// Uses Infof() -> If errorpath required at some point:
// Will need own writer with 'Output(2, out)' to correctly render path
func Printf(format string, v ...interface{}) {
Infof(format, v...)
}
@@ -245,17 +266,20 @@ func Errorf(format string, v ...interface{}) {
}
}
// Writes panic stacktrace, keeps application alive
// Writes panic stacktrace, but keeps application alive
func Panicf(format string, v ...interface{}) {
Errorf(format, v...)
if ErrWriter != io.Discard {
out := printfStr(format, v...)
if logDateTime {
ErrTimeLog.Output(2, out)
} else {
ErrLog.Output(2, out)
}
}
panic("Panic triggered ...")
}
// Writes error log, stops application
func Fatalf(format string, v ...interface{}) {
Errorf(format, v...)
os.Exit(1)
}
func Critf(format string, v ...interface{}) {
if CritWriter != io.Discard {
@@ -268,6 +292,20 @@ func Critf(format string, v ...interface{}) {
}
}
// Writes crit log, stops application
func Fatalf(format string, v ...interface{}) {
if CritWriter != io.Discard {
out := printfStr(format, v...)
if logDateTime {
CritTimeLog.Output(2, out)
} else {
CritLog.Output(2, out)
}
}
os.Exit(1)
}
/* SPECIAL */
func Finfof(w io.Writer, format string, v ...interface{}) {