9119: Use Oj strict mode for decoding JSON.

[arvados.git] / sdk / go / keepclient / discover.go

diff --git a/sdk/go/keepclient/discover.go b/sdk/go/keepclient/discover.go
index 1095085edb1077aa65c4357e0cde8c229ddd1bb7..f039c2181055543bfb0a85ee14710ddd0cf5d1ad 100644 (file)
--- a/sdk/go/keepclient/discover.go
+++ b/sdk/go/keepclient/discover.go
@@ -57,14 +57,14 @@ func (kc *KeepClient) RefreshServices(interval, errInterval time.Duration) {
                timer.Reset(interval)
 
                if err := kc.DiscoverKeepServers(); err != nil {
-                       log.Println("Error retrieving services list: %v (retrying in %v)", err, errInterval)
+                       log.Printf("WARNING: Error retrieving services list: %v (retrying in %v)", err, errInterval)
                        timer.Reset(errInterval)
                        continue
                }
                newRoots := []map[string]string{kc.LocalRoots(), kc.GatewayRoots()}
 
                if !reflect.DeepEqual(previousRoots, newRoots) {
-                       log.Printf("Updated services list: locals %v gateways %v", newRoots[0], newRoots[1])
+                       DebugPrintf("DEBUG: Updated services list: locals %v gateways %v", newRoots[0], newRoots[1])
                        previousRoots = newRoots
                }
 
@@ -84,7 +84,6 @@ func (this *KeepClient) loadKeepServers(list svcList) error {
 
        // replicasPerService is 1 for disks; unknown or unlimited otherwise
        this.replicasPerService = 1
-       this.Using_proxy = false
 
        for _, service := range list.Items {
                scheme := "http"
@@ -100,10 +99,6 @@ func (this *KeepClient) loadKeepServers(list svcList) error {
                listed[url] = true
 
                localRoots[service.Uuid] = url
-               if service.SvcType == "proxy" {
-                       this.Using_proxy = true
-               }
-
                if service.ReadOnly == false {
                        writableLocalRoots[service.Uuid] = url
                        if service.SvcType != "disk" {