Merge branch '15781-multi-value-property-search'

[arvados.git] / sdk / go / httpserver / log.go

diff --git a/sdk/go/httpserver/log.go b/sdk/go/httpserver/log.go
index 7bee88742c01940017882c987a61ed092eacc12d..a6d04780119187e33c51f962c24c110054a89a53 100644 (file)
--- a/sdk/go/httpserver/log.go
+++ b/sdk/go/httpserver/log.go
@@ -1,20 +1,25 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package httpserver
 
 import (
+       "fmt"
        "log"
-       "strings"
 )
 
-var escaper = strings.NewReplacer("\"", "\\\"", "\\", "\\\\", "\n", "\\n")
-
 // Log calls log.Println but first transforms strings so they are
 // safer to write in logs (e.g., 'foo"bar' becomes
-// '"foo\"bar"'). Non-string args are left alone.
+// '"foo\"bar"'). Arguments that aren't strings and don't have a
+// (String() string) method are left alone.
 func Log(args ...interface{}) {
        newargs := make([]interface{}, len(args))
        for i, arg := range args {
                if s, ok := arg.(string); ok {
-                       newargs[i] = "\"" + escaper.Replace(s) + "\""
+                       newargs[i] = fmt.Sprintf("%+q", s)
+               } else if s, ok := arg.(fmt.Stringer); ok {
+                       newargs[i] = fmt.Sprintf("%+q", s.String())
                } else {
                        newargs[i] = arg
                }