docker, ssh: add env variable to set log levels

shellhub-io · Sep 6, 2022 · 4a6215c · 4a6215c
1 parent eb8178e
commit 4a6215c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/.env b/.env
@@ -81,3 +81,7 @@ SHELLHUB_WEBHOOK_SCHEME=""
 # Billing configs
 STRIPE_PUBLISHABLE_KEY=""
 SHELLHUB_BILLING_URL=""
+
+# Default log level for ShellHub
+# Available levels: https://pkg.go.dev/github.com/sirupsen/logrus#Level
+SHELLHUB_LOG_LEVEL="info"
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -19,6 +19,7 @@ services:
       - SHELLHUB_CLOUD=${SHELLHUB_CLOUD}
       - SHELLHUB_BILLING=${SHELLHUB_BILLING}
       - SHELLHUB_ENV=${SHELLHUB_ENV}
+      - SHELLHUB_LOG_LEVEL=${SHELLHUB_LOG_LEVEL}
   api:
     image: api
     build:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,6 +8,7 @@ services:
       - PRIVATE_KEY=/run/secrets/ssh_private_key
       - SHELLHUB_ENTERPRISE=${SHELLHUB_ENTERPRISE}
       - SHELLHUB_CLOUD=${SHELLHUB_CLOUD}
+      - SHELLHUB_LOG_LEVEL=${SHELLHUB_LOG_LEVEL}
       - SHELLHUB_BILLING=${SHELLHUB_BILLING}
       - RECORD_URL=${SHELLHUB_RECORD_URL}
       - BILLING_URL=${SHELLHUB_BILLING_URL}

diff --git a/ssh/main.go b/ssh/main.go
@@ -22,14 +22,24 @@ const (
 	ServerSSHBroker     = ":2222"
 )
 
-func main() {
-	if value, ok := os.LookupEnv("SHELLHUB_ENV"); ok && value == "development" {
-		log.SetLevel(log.TraceLevel)
-		log.Debug("Log level set to Trace")
-	} else {
-		log.Debug("Log level default")
+func init() {
+	level := log.InfoLevel
+
+	if env, ok := os.LookupEnv("SHELLHUB_ENV"); ok && env == "development" {
+		level = log.TraceLevel
+	}
+
+	if env, ok := os.LookupEnv("SHELLHUB_LOG_LEVEL"); ok {
+		if v, err := log.ParseLevel(env); err != nil {
+			level = v
+		}
 	}
 
+	log.WithField("log_level", level.String()).Info("Setting log level")
+	log.SetLevel(level)
+}
+
+func main() {
 	tunnel := sshTunnel.NewTunnel("/ssh/connection", "/ssh/revdial")
 	tunnel.SetConnectionHandler()
 	tunnel.SetCloseHandler()