From 0f4344348419ed6c3ee4236188e456d79e2d51b4 Mon Sep 17 00:00:00 2001 From: Niall Sheridan Date: Tue, 24 Jan 2017 23:51:23 +0000 Subject: Log the datastore warning as a single line --- server/config/config.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/server/config/config.go b/server/config/config.go index f2598a0..eec6d73 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -1,6 +1,7 @@ package config import ( + "bytes" "fmt" "io" "log" @@ -111,20 +112,22 @@ func convertDatastoreConfig(c *Config) { case "mem": c.Server.Database = map[string]string{"type": "mem"} } - log.Println("The `datastore` option has been deprecated in favour of the `database` option. You should update your config.") - log.Println("The new config (passwords have been redacted) should look something like:") - fmt.Printf("server {\n database {\n") + var out bytes.Buffer + out.WriteString("The `datastore` option has been deprecated in favour of the `database` option. You should update your config.\n") + out.WriteString("The new config (passwords have been redacted) should look something like:\n") + out.WriteString("server {\n database {\n") for k, v := range c.Server.Database { if v == "" { continue } if k == "password" { - fmt.Printf(" password = \"[ REDACTED ]\"\n") + out.WriteString(" password = \"[ REDACTED ]\"\n") continue } - fmt.Printf(" %s = \"%s\"\n", k, v) + out.WriteString(fmt.Sprintf(" %s = \"%s\"\n", k, v)) } - fmt.Printf(" }\n}\n") + out.WriteString(" }\n}") + log.Println(out.String()) } } -- cgit v1.2.3