Commit 1b4c9d2a authored by Joshua Gutow's avatar Joshua Gutow

op-service: Set root & oprpc loggers

Two related changes
1. Set the root logger handler when we create a logger in oplog.
2. Set the log option when creating oprc servers.

The purpose of these changes is to make sure that we use the same
log format everywhere.
parent 25833816
...@@ -81,6 +81,7 @@ func Main(version string, cliCtx *cli.Context) error { ...@@ -81,6 +81,7 @@ func Main(version string, cliCtx *cli.Context) error {
rpcCfg.ListenAddr, rpcCfg.ListenAddr,
rpcCfg.ListenPort, rpcCfg.ListenPort,
version, version,
oprpc.WithLogger(l),
) )
if rpcCfg.EnableAdmin { if rpcCfg.EnableAdmin {
server.AddAPI(gethrpc.API{ server.AddAPI(gethrpc.API{
......
...@@ -92,7 +92,7 @@ func Main(version string, cliCtx *cli.Context) error { ...@@ -92,7 +92,7 @@ func Main(version string, cliCtx *cli.Context) error {
} }
rpcCfg := cfg.RPCConfig rpcCfg := cfg.RPCConfig
server := oprpc.NewServer(rpcCfg.ListenAddr, rpcCfg.ListenPort, version) server := oprpc.NewServer(rpcCfg.ListenAddr, rpcCfg.ListenPort, version, oprpc.WithLogger(l))
if err := server.Start(); err != nil { if err := server.Start(); err != nil {
cancel() cancel()
return fmt.Errorf("error starting RPC server: %w", err) return fmt.Errorf("error starting RPC server: %w", err)
......
...@@ -65,6 +65,9 @@ func NewLogger(cfg CLIConfig) log.Logger { ...@@ -65,6 +65,9 @@ func NewLogger(cfg CLIConfig) log.Logger {
handler := log.StreamHandler(os.Stdout, Format(cfg.Format, cfg.Color)) handler := log.StreamHandler(os.Stdout, Format(cfg.Format, cfg.Color))
handler = log.SyncHandler(handler) handler = log.SyncHandler(handler)
handler = log.LvlFilterHandler(Level(cfg.Level), handler) handler = log.LvlFilterHandler(Level(cfg.Level), handler)
// Set the root handle to what we have configured. Some components like go-ethereum's RPC
// server use log.Root() instead of being able to pass in a log.
log.Root().SetHandler(handler)
logger := log.New() logger := log.New()
logger.SetHandler(handler) logger.SetHandler(handler)
return logger return logger
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment