summaryrefslogtreecommitdiff
path: root/testrig
diff options
context:
space:
mode:
Diffstat (limited to 'testrig')
-rw-r--r--testrig/config.go3
-rw-r--r--testrig/util.go7
2 files changed, 5 insertions, 5 deletions
diff --git a/testrig/config.go b/testrig/config.go
index fdc026e61..93d7fb554 100644
--- a/testrig/config.go
+++ b/testrig/config.go
@@ -57,7 +57,8 @@ func InitTestConfig() {
func testDefaults() config.Configuration {
return config.Configuration{
LogLevel: envStr("GTS_LOG_LEVEL", "error"),
- LogTimestampFormat: "02/01/2006 15:04:05.000",
+ LogFormat: envStr("GTS_LOG_FORMAT", "logfmt"),
+ LogTimestampFormat: envStr("GTS_LOG_TIMESTAMP_FORMAT", "02/01/2006 15:04:05.000"),
LogDbQueries: true,
ApplicationName: "gotosocial",
LandingPageUser: "",
diff --git a/testrig/util.go b/testrig/util.go
index bdd18ec29..b2602fbda 100644
--- a/testrig/util.go
+++ b/testrig/util.go
@@ -31,7 +31,7 @@ import (
"code.superseriousbusiness.org/gotosocial/internal/messages"
"code.superseriousbusiness.org/gotosocial/internal/processing/workers"
"code.superseriousbusiness.org/gotosocial/internal/state"
- "codeberg.org/gruf/go-kv/v2"
+ "codeberg.org/gruf/go-kv/v2/format"
)
// Starts workers on the provided state using noop processing functions.
@@ -282,7 +282,6 @@ func WaitFor(condition func() bool) bool {
// dump returns debug output of 'v'.
func dump(v any) string {
- var kv kv.Field
- kv.V = v
- return kv.Value(false)
+ buf := format.Global.Append(nil, v, format.DefaultArgs())
+ return string(buf)
}