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
40 lines
861 B
Go
40 lines
861 B
Go
package logging
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
|
|
log "github.com/hashicorp/go-hclog"
|
|
)
|
|
|
|
// NewVaultLogger creates a new logger with the specified level and a Vault
|
|
// formatter
|
|
func NewVaultLogger(level log.Level) log.Logger {
|
|
return NewVaultLoggerWithWriter(log.DefaultOutput, level)
|
|
}
|
|
|
|
// NewVaultLoggerWithWriter creates a new logger with the specified level and
|
|
// writer and a Vault formatter
|
|
func NewVaultLoggerWithWriter(w io.Writer, level log.Level) log.Logger {
|
|
opts := &log.LoggerOptions{
|
|
Level: level,
|
|
Output: w,
|
|
JSONFormat: useJson(),
|
|
}
|
|
return log.New(opts)
|
|
}
|
|
|
|
func useJson() bool {
|
|
logFormat := os.Getenv("VAULT_LOG_FORMAT")
|
|
if logFormat == "" {
|
|
logFormat = os.Getenv("LOGXI_FORMAT")
|
|
}
|
|
switch strings.ToLower(logFormat) {
|
|
case "json", "vault_json", "vault-json", "vaultjson":
|
|
return true
|
|
default:
|
|
return false
|
|
}
|
|
}
|