updating to have func to print prefix

This commit is contained in:
2021-02-27 00:51:58 -05:00
parent c6d53a0cca
commit 80985d1084
6 changed files with 59 additions and 44 deletions

View File

@@ -1,14 +1,14 @@
package logging
import (
native `log`
`os`
`path`
native "log"
"os"
"path"
"r00t2.io/goutils/types"
sysd `github.com/coreos/go-systemd/journal`
`r00t2.io/sysutils/paths`
sysd "github.com/coreos/go-systemd/journal"
"r00t2.io/sysutils/paths"
)
var (
@@ -39,9 +39,13 @@ func GetLogger(enableDebug bool, prefix string, logpaths ...string) (logger Logg
var stat os.FileInfo
var devlogPath string = devlog
if hasSyslog, stat, err = paths.RealPathExistsStat(&devlogPath); hasSyslog && err != nil {return}
if hasSyslog, stat, err = paths.RealPathExistsStat(&devlogPath); hasSyslog && err != nil {
return
}
if hasSyslog && !stat.Mode().IsRegular() {logflags.AddFlag(LogSyslog)} else {
if hasSyslog && !stat.Mode().IsRegular() {
logflags.AddFlag(LogSyslog)
} else {
var exists bool
var success bool
var ckLogPaths []string
@@ -80,27 +84,27 @@ func GetLogger(enableDebug bool, prefix string, logpaths ...string) (logger Logg
if logflags.HasFlag(LogJournald) {
logger = &SystemDLogger{
Prefix: logPrefix,
Prefix: logPrefix,
EnableDebug: enableDebug,
}
} else {
if logflags.HasFlag(LogSyslog) {
logger = &SyslogLogger{
Prefix: logPrefix,
Prefix: logPrefix,
EnableDebug: enableDebug,
}
} else {
if logflags.HasFlag(LogFile) {
logger = &FileLogger{
StdLogger: StdLogger{
Prefix: logPrefix,
Prefix: logPrefix,
EnableDebug: enableDebug,
},
Path: logPath,
Path: logPath,
}
} else {
logger = &StdLogger{
Prefix: logPrefix,
Prefix: logPrefix,
EnableDebug: enableDebug,
}
}
@@ -112,7 +116,7 @@ func GetLogger(enableDebug bool, prefix string, logpaths ...string) (logger Logg
logger.setPrefix(prefix)
}
logger.Info("logger initialized of type %T with prefix %v", logger, logger.Prefix)
logger.Info("logger initialized of type %T with prefix %v", logger, logger.GetPrefix())
return
}