From e8819b00724c68dfbfcb6a4c5f3d8de985a74da0 Mon Sep 17 00:00:00 2001 From: Daniele Sluijters Date: Fri, 26 Apr 2024 10:55:44 +0200 Subject: [PATCH] [chore] Update setting testrig loglevel cmp.Or was introduced in Go 1.22 and picks the first value that's not the zero value for the type. For a string, the zero value is the empty string, which is what os.Getenv will return if the environment variable is not set. That then results in "error" being returned instead. This allows loading an environment variable with a default without having to do the check and write out the conditional. --- testrig/config.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/testrig/config.go b/testrig/config.go index 8b69b714c..2717b733e 100644 --- a/testrig/config.go +++ b/testrig/config.go @@ -18,6 +18,7 @@ package testrig import ( + "cmp" "os" "time" @@ -34,16 +35,8 @@ func InitTestConfig() { }) } -func logLevel() string { - level := "error" - if lv := os.Getenv("GTS_LOG_LEVEL"); lv != "" { - level = lv - } - return level -} - var testDefaults = config.Configuration{ - LogLevel: logLevel(), + LogLevel: cmp.Or(os.Getenv("GTS_LOG_LEVEL"), "error"), LogTimestampFormat: "02/01/2006 15:04:05.000", LogDbQueries: true, ApplicationName: "gotosocial",