forked from toolshed/abra
log: output caller on debug, use stdout as default
This commit is contained in:
parent
050a479df7
commit
cde06f4f00
@ -17,6 +17,7 @@ import (
|
|||||||
"coopcloud.tech/abra/pkg/config"
|
"coopcloud.tech/abra/pkg/config"
|
||||||
"coopcloud.tech/abra/pkg/log"
|
"coopcloud.tech/abra/pkg/log"
|
||||||
"coopcloud.tech/abra/pkg/web"
|
"coopcloud.tech/abra/pkg/web"
|
||||||
|
charmLog "github.com/charmbracelet/log"
|
||||||
"github.com/urfave/cli"
|
"github.com/urfave/cli"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -183,6 +184,7 @@ func newAbraApp(version, commit string) *cli.App {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
charmLog.SetDefault(log.Logger)
|
||||||
log.Debugf("abra version %s, commit %s", version, commit)
|
log.Debugf("abra version %s, commit %s", version, commit)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -289,6 +289,7 @@ func SubCommandBefore(c *cli.Context) error {
|
|||||||
if Debug {
|
if Debug {
|
||||||
log.SetLevel(log.DebugLevel)
|
log.SetLevel(log.DebugLevel)
|
||||||
log.SetOutput(os.Stderr)
|
log.SetOutput(os.Stderr)
|
||||||
|
log.SetReportCaller(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -7,27 +7,28 @@ import (
|
|||||||
charmLog "github.com/charmbracelet/log"
|
charmLog "github.com/charmbracelet/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Log is the central logging interface.
|
// Logger is the central logging interface.
|
||||||
var log = charmLog.NewWithOptions(os.Stderr, charmLog.Options{
|
var Logger = charmLog.NewWithOptions(os.Stdout, charmLog.Options{
|
||||||
ReportCaller: true,
|
ReportCaller: false,
|
||||||
ReportTimestamp: false,
|
ReportTimestamp: false,
|
||||||
})
|
})
|
||||||
|
|
||||||
var Fatal = log.Fatal
|
var Fatal = Logger.Fatal
|
||||||
var Fatalf = log.Fatalf
|
var Fatalf = Logger.Fatalf
|
||||||
|
|
||||||
var Debug = log.Debug
|
var Debug = Logger.Debug
|
||||||
var Debugf = log.Debugf
|
var Debugf = Logger.Debugf
|
||||||
|
|
||||||
var Info = log.Info
|
var Info = Logger.Info
|
||||||
var Infof = log.Infof
|
var Infof = Logger.Infof
|
||||||
|
|
||||||
var Warn = log.Warn
|
var Warn = Logger.Warn
|
||||||
var Warnf = log.Warnf
|
var Warnf = Logger.Warnf
|
||||||
|
|
||||||
var Error = log.Error
|
var Error = Logger.Error
|
||||||
var Errorf = log.Errorf
|
var Errorf = Logger.Errorf
|
||||||
|
|
||||||
var SetLevel = log.SetLevel
|
var SetLevel = Logger.SetLevel
|
||||||
var DebugLevel = charmLog.DebugLevel
|
var DebugLevel = charmLog.DebugLevel
|
||||||
var SetOutput = charmLog.SetOutput
|
var SetOutput = charmLog.SetOutput
|
||||||
|
var SetReportCaller = charmLog.SetReportCaller
|
||||||
|
Loading…
x
Reference in New Issue
Block a user