From 3849a5ef4ca00070798e8c5af21366829da7cabb Mon Sep 17 00:00:00 2001 From: Zach Howard Date: Fri, 14 Oct 2022 14:22:33 -0400 Subject: [PATCH] adds log level conf to proxyd --- .changeset/wet-cameras-cover.md | 5 +++++ proxyd/cmd/proxyd/main.go | 15 +++++++++++++++ proxyd/config.go | 1 + proxyd/example.config.toml | 2 ++ 4 files changed, 23 insertions(+) create mode 100644 .changeset/wet-cameras-cover.md diff --git a/.changeset/wet-cameras-cover.md b/.changeset/wet-cameras-cover.md new file mode 100644 index 0000000000000..4c678a8497893 --- /dev/null +++ b/.changeset/wet-cameras-cover.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/proxyd': minor +--- + +adds server.log_level config diff --git a/proxyd/cmd/proxyd/main.go b/proxyd/cmd/proxyd/main.go index db3828b337ffc..c184a1d3fdbf4 100644 --- a/proxyd/cmd/proxyd/main.go +++ b/proxyd/cmd/proxyd/main.go @@ -37,6 +37,21 @@ func main() { log.Crit("error reading config file", "err", err) } + // update log level from config + logLevel, err := log.LvlFromString(config.Server.LogLevel) + if err != nil { + logLevel = log.LvlInfo + if config.Server.LogLevel != "" { + log.Warn("invalid server.log_level set: " + config.Server.LogLevel) + } + } + log.Root().SetHandler( + log.LvlFilterHandler( + logLevel, + log.StreamHandler(os.Stdout, log.JSONFormat()), + ), + ) + shutdown, err := proxyd.Start(config) if err != nil { log.Crit("error starting proxyd", "err", err) diff --git a/proxyd/config.go b/proxyd/config.go index d0a32d669cba6..9890121320e81 100644 --- a/proxyd/config.go +++ b/proxyd/config.go @@ -14,6 +14,7 @@ type ServerConfig struct { WSPort int `toml:"ws_port"` MaxBodySizeBytes int64 `toml:"max_body_size_bytes"` MaxConcurrentRPCs int64 `toml:"max_concurrent_rpcs"` + LogLevel string `toml:"log_level"` // TimeoutSeconds specifies the maximum time spent serving an HTTP request. Note that isn't used for websocket connections TimeoutSeconds int `toml:"timeout_seconds"` diff --git a/proxyd/example.config.toml b/proxyd/example.config.toml index 25739106b8121..fb8fea941b7d9 100644 --- a/proxyd/example.config.toml +++ b/proxyd/example.config.toml @@ -19,6 +19,8 @@ ws_port = 8085 # Maximum client body size, in bytes, that the server will accept. max_body_size_bytes = 10485760 max_concurrent_rpcs = 1000 +# Server log level +log_level = "info" [redis] # URL to a Redis instance.