From 24a3668bc8d3657ed239f6005b553d7cd183e7d4 Mon Sep 17 00:00:00 2001
From: Zach Howard <zach@optimism.io>
Date: Fri, 14 Oct 2022 14:56:27 -0400
Subject: [PATCH] adds log level conf to proxyd (#3704)

---
 proxyd/proxyd/cmd/proxyd/main.go  | 15 +++++++++++++++
 proxyd/proxyd/config.go           |  1 +
 proxyd/proxyd/example.config.toml |  2 ++
 3 files changed, 18 insertions(+)

diff --git a/proxyd/proxyd/cmd/proxyd/main.go b/proxyd/proxyd/cmd/proxyd/main.go
index db3828b..c184a1d 100644
--- a/proxyd/proxyd/cmd/proxyd/main.go
+++ b/proxyd/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/proxyd/config.go b/proxyd/proxyd/config.go
index d0a32d6..9890121 100644
--- a/proxyd/proxyd/config.go
+++ b/proxyd/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/proxyd/example.config.toml b/proxyd/proxyd/example.config.toml
index 2573910..fb8fea9 100644
--- a/proxyd/proxyd/example.config.toml
+++ b/proxyd/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.