kairos/kairos-sdk
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-sdk.git synced 2025-08-02 07:49:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix journald logging (#597)

Browse Source
This commit is contained in:
Itxaka 2025-05-08 14:49:09 +02:00 committed by GitHub
parent 571996d6ba
commit 2f206da0fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
types/logger.go
View File

@ -115,7 +115,7 @@ func (m KairosLogger) Infof(tpl string, args ...interface{}) {
}
func (m KairosLogger) Info(args ...interface{}) {
if !m.journald {
args = append([]interface{}{fmt.Sprintf("[%v]", os.Getpid())}, args...)
args = append([]interface{}{fmt.Sprintf("[%v] ", os.Getpid())}, args...)
}
m.Logger.Info().Msg(fmt.Sprint(args...))
}
@ -127,14 +127,14 @@ func (m KairosLogger) Warnf(tpl string, args ...interface{}) {
}
func (m KairosLogger) Warn(args ...interface{}) {
if !m.journald {
args = append([]interface{}{fmt.Sprintf("[%v]", os.Getpid())}, args...)
args = append([]interface{}{fmt.Sprintf("[%v] ", os.Getpid())}, args...)
}
m.Logger.Warn().Msg(fmt.Sprint(args...))
}
func (m KairosLogger) Warning(args ...interface{}) {
if !m.journald {
args = append([]interface{}{fmt.Sprintf("[%v]", os.Getpid())}, args...)
args = append([]interface{}{fmt.Sprintf("[%v] ", os.Getpid())}, args...)
}
m.Logger.Warn().Msg(fmt.Sprint(args...))
}
@ -154,7 +154,7 @@ func (m KairosLogger) Debugf(tpl string, args ...interface{}) {
}
func (m KairosLogger) Debug(args ...interface{}) {
if !m.journald {
args = append([]interface{}{fmt.Sprintf("[%v]", os.Getpid())}, args...)
args = append([]interface{}{fmt.Sprintf("[%v] ", os.Getpid())}, args...)
}
m.Logger.Debug().Msg(fmt.Sprint(args...))
}
@ -166,7 +166,7 @@ func (m KairosLogger) Errorf(tpl string, args ...interface{}) {
}
func (m KairosLogger) Error(args ...interface{}) {
if !m.journald {
args = append([]interface{}{fmt.Sprintf("[%v]", os.Getpid())}, args...)
args = append([]interface{}{fmt.Sprintf("[%v] ", os.Getpid())}, args...)
}
m.Logger.Error().Msg(fmt.Sprint(args...))
}
@ -178,7 +178,7 @@ func (m KairosLogger) Fatalf(tpl string, args ...interface{}) {
}
func (m KairosLogger) Fatal(args ...interface{}) {
if !m.journald {
args = append([]interface{}{fmt.Sprintf("[%v]", os.Getpid())}, args...)
args = append([]interface{}{fmt.Sprintf("[%v] ", os.Getpid())}, args...)
}
m.Logger.Fatal().Msg(fmt.Sprint(args...))
}
@ -190,7 +190,7 @@ func (m KairosLogger) Panicf(tpl string, args ...interface{}) {
}
func (m KairosLogger) Panic(args ...interface{}) {
if !m.journald {
args = append([]interface{}{fmt.Sprintf("[%v]", os.Getpid())}, args...)
args = append([]interface{}{fmt.Sprintf("[%v] ", os.Getpid())}, args...)
}
m.Logger.Panic().Msg(fmt.Sprint(args...))
}
@ -202,7 +202,7 @@ func (m KairosLogger) Tracef(tpl string, args ...interface{}) {
}
func (m KairosLogger) Trace(args ...interface{}) {
if !m.journald {
args = append([]interface{}{fmt.Sprintf("[%v]", os.Getpid())}, args...)
args = append([]interface{}{fmt.Sprintf("[%v] ", os.Getpid())}, args...)
}
m.Logger.Trace().Msg(fmt.Sprint(args...))
}

3
types/logger_linux.go
View File

@ -19,5 +19,8 @@ func isJournaldAvailable() bool {
}
func getJournaldWriter() io.Writer {
if !isJournaldAvailable() {
return nil
}
return journald.NewJournalDWriter()
}