03cf302e9a
* logbridge with hclog and identical output * Initial search & replace This compiles, but there is a fair amount of TODO and commented out code, especially around the plugin logclient/logserver code. * strip logbridge * fix majority of tests * update logxi aliases * WIP fixing tests * more test fixes * Update test to hclog * Fix format * Rename hclog -> log * WIP making hclog and logxi love each other * update logger_test.go * clean up merged comments * Replace RawLogger interface with a Logger * Add some logger names * Replace Trace with Debug * update builtin logical logging patterns * Fix build errors * More log updates * update log approach in command and builtin * More log updates * update helper, http, and logical directories * Update loggers * Log updates * Update logging * Update logging * Update logging * Update logging * update logging in physical * prefixing and lowercase * Update logging * Move phyisical logging name to server command * Fix som tests * address jims feedback so far * incorporate brians feedback so far * strip comments * move vault.go to logging package * update Debug to Trace * Update go-plugin deps * Update logging based on review comments * Updates from review * Unvendor logxi * Remove null_logger.go
135 lines
2.7 KiB
Go
135 lines
2.7 KiB
Go
package plugin
|
|
|
|
import hclog "github.com/hashicorp/go-hclog"
|
|
|
|
type LoggerServer struct {
|
|
logger hclog.Logger
|
|
}
|
|
|
|
func (l *LoggerServer) Trace(args *LoggerArgs, _ *struct{}) error {
|
|
l.logger.Trace(args.Msg, args.Args...)
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) Debug(args *LoggerArgs, _ *struct{}) error {
|
|
l.logger.Debug(args.Msg, args.Args...)
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) Info(args *LoggerArgs, _ *struct{}) error {
|
|
l.logger.Info(args.Msg, args.Args...)
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) Warn(args *LoggerArgs, reply *LoggerReply) error {
|
|
l.logger.Warn(args.Msg, args.Args...)
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) Error(args *LoggerArgs, reply *LoggerReply) error {
|
|
l.logger.Error(args.Msg, args.Args...)
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) Log(args *LoggerArgs, _ *struct{}) error {
|
|
|
|
switch translateLevel(args.Level) {
|
|
|
|
case hclog.Trace:
|
|
l.logger.Trace(args.Msg, args.Args...)
|
|
|
|
case hclog.Debug:
|
|
l.logger.Debug(args.Msg, args.Args...)
|
|
|
|
case hclog.Info:
|
|
l.logger.Info(args.Msg, args.Args...)
|
|
|
|
case hclog.Warn:
|
|
l.logger.Warn(args.Msg, args.Args...)
|
|
|
|
case hclog.Error:
|
|
l.logger.Error(args.Msg, args.Args...)
|
|
|
|
case hclog.NoLevel:
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) SetLevel(args int, _ *struct{}) error {
|
|
level := translateLevel(args)
|
|
l.logger = hclog.New(&hclog.LoggerOptions{Level: level})
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) IsTrace(args interface{}, reply *LoggerReply) error {
|
|
result := l.logger.IsTrace()
|
|
*reply = LoggerReply{
|
|
IsTrue: result,
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) IsDebug(args interface{}, reply *LoggerReply) error {
|
|
result := l.logger.IsDebug()
|
|
*reply = LoggerReply{
|
|
IsTrue: result,
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) IsInfo(args interface{}, reply *LoggerReply) error {
|
|
result := l.logger.IsInfo()
|
|
*reply = LoggerReply{
|
|
IsTrue: result,
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (l *LoggerServer) IsWarn(args interface{}, reply *LoggerReply) error {
|
|
result := l.logger.IsWarn()
|
|
*reply = LoggerReply{
|
|
IsTrue: result,
|
|
}
|
|
return nil
|
|
}
|
|
|
|
type LoggerArgs struct {
|
|
Level int
|
|
Msg string
|
|
Args []interface{}
|
|
}
|
|
|
|
// LoggerReply contains the RPC reply. Not all fields may be used
|
|
// for a particular RPC call.
|
|
type LoggerReply struct {
|
|
IsTrue bool
|
|
Error error
|
|
}
|
|
|
|
func translateLevel(logxiLevel int) hclog.Level {
|
|
|
|
switch logxiLevel {
|
|
|
|
case 1000, 10:
|
|
// logxi.LevelAll, logxi.LevelTrace:
|
|
return hclog.Trace
|
|
|
|
case 7:
|
|
// logxi.LevelDebug:
|
|
return hclog.Debug
|
|
|
|
case 6, 5:
|
|
// logxi.LevelInfo, logxi.LevelNotice:
|
|
return hclog.Info
|
|
|
|
case 4:
|
|
// logxi.LevelWarn:
|
|
return hclog.Warn
|
|
|
|
case 3, 2, 1, -1:
|
|
// logxi.LevelError, logxi.LevelFatal, logxi.LevelAlert, logxi.LevelEmergency:
|
|
return hclog.Error
|
|
}
|
|
return hclog.NoLevel
|
|
}
|