From 45fde4790282d709f0800d291dd867a9c36f0697 Mon Sep 17 00:00:00 2001 From: hageshtrem Date: Fri, 21 Apr 2023 10:45:46 +0300 Subject: [PATCH] Remove redis password from workwebui log --- cmd/workwebui/main.go | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/cmd/workwebui/main.go b/cmd/workwebui/main.go index 6ffe0cd2..da31367d 100644 --- a/cmd/workwebui/main.go +++ b/cmd/workwebui/main.go @@ -3,17 +3,18 @@ package main import ( "flag" "fmt" + "net/url" "os" "os/signal" "strconv" "time" - "github.com/sbermarket-tech/work/webui" "github.com/gomodule/redigo/redis" + "github.com/sbermarket-tech/work/webui" ) var ( - redisHostPort = flag.String("redis", ":6379", "redis hostport") + redisDSN = flag.String("redis", "redis://0.0.0.0:6379", "redis DSN") redisDatabase = flag.String("database", "0", "redis database") redisNamespace = flag.String("ns", "work", "redis namespace") webHostPort = flag.String("listen", ":5040", "hostport to listen for HTTP JSON API") @@ -22,19 +23,25 @@ var ( func main() { flag.Parse() - fmt.Println("Starting workwebui:") - fmt.Println("redis = ", *redisHostPort) - fmt.Println("database = ", *redisDatabase) - fmt.Println("namespace = ", *redisNamespace) - fmt.Println("listen = ", *webHostPort) + redisURL, err := url.Parse(*redisDSN) + if err != nil { + fmt.Printf("Error: %v\n", err) + os.Exit(1) + } database, err := strconv.Atoi(*redisDatabase) if err != nil { - fmt.Printf("Error: %v is not a valid database value", *redisDatabase) - return + fmt.Printf("Error: %v is not a valid database value\n", *redisDatabase) + os.Exit(1) } - pool := newPool(*redisHostPort, database) + fmt.Println("Starting workwebui:") + fmt.Println("redis = ", redisURL.Redacted()) + fmt.Println("database = ", *redisDatabase) + fmt.Println("namespace = ", *redisNamespace) + fmt.Println("listen = ", *webHostPort) + + pool := newPool(*redisDSN, database) server := webui.NewServer(*redisNamespace, pool, *webHostPort) server.Start()