Prefer %+q over %q in log messages.

client/client.go

@@ -1309,7 +1309,7 @@ func (c *Client) setupConsulSyncer() error {
 			}
 			consulServices, _, err := consulCatalog.Service(nomadServerServiceName, consul.ServiceTagRPC, opts)
 			if err != nil {
-				mErr.Errors = append(mErr.Errors, fmt.Errorf("unable to query service %q from Consul datacenter %q: %v", nomadServerServiceName, dc, err))
+				mErr.Errors = append(mErr.Errors, fmt.Errorf("unable to query service %+q from Consul datacenter %+q: %v", nomadServerServiceName, dc, err))
 				continue
 			}
 
@@ -1345,9 +1345,9 @@ func (c *Client) setupConsulSyncer() error {
 			}
 
 			for i := range dcs {
-				dcs[i] = fmt.Sprintf("%q", dcs[i])
+				dcs[i] = fmt.Sprintf("%+q", dcs[i])
 			}
-			return fmt.Errorf("no Nomad Servers advertising service %q in Consul datacenters: %s", nomadServerServiceName, dcs)
+			return fmt.Errorf("no Nomad Servers advertising service %+q in Consul datacenters: %+q", nomadServerServiceName, dcs)
 		}
 
 		c.heartbeatLock.Lock()

client/rpcproxy/rpcproxy.go

@@ -192,8 +192,8 @@ func (p *RPCProxy) SetBackupServers(addrs []string) error {
 	for _, s := range addrs {
 		s, err := NewServerEndpoint(s)
 		if err != nil {
-			p.logger.Printf("[WARN] client.rpcproxy: unable to create backup server %q: %v", s, err)
-			return fmt.Errorf("unable to create new backup server from %q: %v", s, err)
+			p.logger.Printf("[WARN] client.rpcproxy: unable to create backup server %+q: %v", s, err)
+			return fmt.Errorf("unable to create new backup server from %+q: %v", s, err)
 		}
 		l = append(l, s)
 	}
@@ -221,7 +221,7 @@ func (p *RPCProxy) SetBackupServers(addrs []string) error {
 func (p *RPCProxy) AddPrimaryServer(rpcAddr string) *ServerEndpoint {
 	s, err := NewServerEndpoint(rpcAddr)
 	if err != nil {
-		p.logger.Printf("[WARN] client.rpcproxy: unable to create new primary server from endpoint %q: %v", rpcAddr, err)
+		p.logger.Printf("[WARN] client.rpcproxy: unable to create new primary server from endpoint %+q: %v", rpcAddr, err)
 		return nil
 	}
 
@@ -706,14 +706,14 @@ func (p *RPCProxy) RefreshServerLists(servers []*structs.NodeServerInfo, numNode
 				continue
 			}
 
-			p.logger.Printf("[WARN] client.rpcproxy: API mismatch between client version (v%d.%d) and server version (v%d.%d), ignoring server %q", p.configInfo.RPCMajorVersion(), p.configInfo.RPCMinorVersion(), s.RPCMajorVersion, s.RPCMinorVersion, s.RPCAdvertiseAddr)
+			p.logger.Printf("[WARN] client.rpcproxy: API mismatch between client version (v%d.%d) and server version (v%d.%d), ignoring server %+q", p.configInfo.RPCMajorVersion(), p.configInfo.RPCMinorVersion(), s.RPCMajorVersion, s.RPCMinorVersion, s.RPCAdvertiseAddr)
 			p.rpcAPIMismatchThrottle[s.RPCAdvertiseAddr] = now.Add(rpcAPIMismatchLogRate)
 			continue
 		}
 
 		server, err := NewServerEndpoint(s.RPCAdvertiseAddr)
 		if err != nil {
-			p.logger.Printf("[WARN] client.rpcproxy: Unable to create a server from %q: %v", s.RPCAdvertiseAddr, err)
+			p.logger.Printf("[WARN] client.rpcproxy: Unable to create a server from %+q: %v", s.RPCAdvertiseAddr, err)
 			continue
 		}
 

client/rpcproxy/rpcproxy_test.go

@@ -306,7 +306,7 @@ func TestRPCProxy_NumServers(t *testing.T) {
 		serverName := makeServerEndpointName()
 		s := p.AddPrimaryServer(serverName)
 		if s == nil {
-			t.Fatalf("Expected server from %q", serverName)
+			t.Fatalf("Expected server from %+q", serverName)
 		}
 		serverList = append(serverList, s)
 
@@ -380,11 +380,11 @@ func TestRPCProxy_RemoveServer(t *testing.T) {
 		t.Fatalf("bad")
 	}
 	if s1 == nil || s1.Name != s1Endpoint {
-		t.Fatalf("Expected s1 server: %q", s1.Name)
+		t.Fatalf("Expected s1 server: %+q", s1.Name)
 	}
 	s1 = p.FindServer()
 	if s1 == nil || s1.Name != s1Endpoint {
-		t.Fatalf("Expected s1 server: %q", s1.Name)
+		t.Fatalf("Expected s1 server: %+q", s1.Name)
 	}
 	p.RemoveServer(s1)
 	if p.NumServers() != 0 {
@@ -406,17 +406,17 @@ func TestRPCProxy_RemoveServer(t *testing.T) {
 		t.Fatalf("bad")
 	}
 	if s2 == nil || s2.Name != s2Endpoint {
-		t.Fatalf("Expected s2 server: %q", s2.Name)
+		t.Fatalf("Expected s2 server: %+q", s2.Name)
 	}
 	s1 = p.FindServer()
 	if s1 == nil || s1.Name != s1Endpoint {
-		t.Fatalf("Expected s1 to be the front of the list: %q==%q", s1.Name, s1Endpoint)
+		t.Fatalf("Expected s1 to be the front of the list: %+q==%+q", s1.Name, s1Endpoint)
 	}
 	// Move s1 to the back of the server list
 	p.NotifyFailedServer(s1)
 	s2 = p.FindServer()
 	if s2 == nil || s2.Name != s2Endpoint {
-		t.Fatalf("Expected s2 server: %q", s2Endpoint)
+		t.Fatalf("Expected s2 server: %+q", s2Endpoint)
 	}
 	p.RemoveServer(s2)
 	if p.NumServers() != 1 {

command/agent/agent.go

@@ -184,7 +184,7 @@ func (a *Agent) serverConfig() (*nomad.Config, error) {
 	}
 	addr, err := net.ResolveTCPAddr("tcp", a.serverHTTPAddr)
 	if err != nil {
-		return nil, fmt.Errorf("error resolving HTTP addr %q: %v", a.serverHTTPAddr, err)
+		return nil, fmt.Errorf("error resolving HTTP addr %+q: %v", a.serverHTTPAddr, err)
 	}
 	a.serverHTTPAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
 
@@ -200,7 +200,7 @@ func (a *Agent) serverConfig() (*nomad.Config, error) {
 	}
 	addr, err = net.ResolveTCPAddr("tcp", a.serverRPCAddr)
 	if err != nil {
-		return nil, fmt.Errorf("error resolving RPC addr %q: %v", a.serverRPCAddr, err)
+		return nil, fmt.Errorf("error resolving RPC addr %+q: %v", a.serverRPCAddr, err)
 	}
 	a.serverRPCAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
 
@@ -216,7 +216,7 @@ func (a *Agent) serverConfig() (*nomad.Config, error) {
 	}
 	addr, err = net.ResolveTCPAddr("tcp", a.serverSerfAddr)
 	if err != nil {
-		return nil, fmt.Errorf("error resolving Serf addr %q: %v", a.serverSerfAddr, err)
+		return nil, fmt.Errorf("error resolving Serf addr %+q: %v", a.serverSerfAddr, err)
 	}
 	a.serverSerfAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
 
@@ -302,7 +302,7 @@ func (a *Agent) clientConfig() (*clientconfig.Config, error) {
 	}
 	addr, err := net.ResolveTCPAddr("tcp", a.clientHTTPAddr)
 	if err != nil {
-		return nil, fmt.Errorf("error resolving HTTP addr %q: %v", a.clientHTTPAddr, err)
+		return nil, fmt.Errorf("error resolving HTTP addr %+q: %v", a.clientHTTPAddr, err)
 	}
 	httpAddr := fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
 	conf.Node.HTTPAddr = httpAddr
@@ -320,7 +320,7 @@ func (a *Agent) clientConfig() (*clientconfig.Config, error) {
 	}
 	addr, err = net.ResolveTCPAddr("tcp", a.clientRPCAddr)
 	if err != nil {
-		return nil, fmt.Errorf("error resolving RPC addr %q: %v", a.clientRPCAddr, err)
+		return nil, fmt.Errorf("error resolving RPC addr %+q: %v", a.clientRPCAddr, err)
 	}
 	a.clientRPCAddr = fmt.Sprintf("%s:%d", addr.IP.String(), addr.Port)
 

command/agent/consul/syncer.go

@@ -347,7 +347,7 @@ func (c *Syncer) Shutdown() error {
 	}
 	for _, service := range services {
 		if err := c.client.Agent().ServiceDeregister(service.ID); err != nil {
-			c.logger.Printf("[WARN] consul.syncer: failed to deregister service ID %q: %v", service.ID, err)
+			c.logger.Printf("[WARN] consul.syncer: failed to deregister service ID %+q: %v", service.ID, err)
 			mErr.Errors = append(mErr.Errors, err)
 		}
 	}
@@ -696,7 +696,7 @@ func (c *Syncer) createDelegatedCheckReg(check *structs.ServiceCheck, service *c
 	case structs.ServiceCheckScript:
 		chkReg.TTL = (check.Interval + ttlCheckBuffer).String()
 	default:
-		return nil, fmt.Errorf("check type %q not valid", check.Type)
+		return nil, fmt.Errorf("check type %+q not valid", check.Type)
 	}
 	return &chkReg, nil
 }
@@ -764,12 +764,12 @@ func (c *Syncer) Run() {
 
 			if err := c.SyncServices(); err != nil {
 				if c.consulAvailable {
-					c.logger.Printf("[DEBUG] consul.syncer: disabling checks until successful sync for %q: %v", c.serviceRegPrefix, err)
+					c.logger.Printf("[DEBUG] consul.syncer: disabling checks until successful sync for %+q: %v", c.serviceRegPrefix, err)
 				}
 				c.consulAvailable = false
 			} else {
 				if !c.consulAvailable {
-					c.logger.Printf("[DEBUG] consul.syncer: re-enabling checks for for %q", c.serviceRegPrefix)
+					c.logger.Printf("[DEBUG] consul.syncer: re-enabling checks for for %+q", c.serviceRegPrefix)
 				}
 				c.consulAvailable = true
 			}
@@ -779,7 +779,7 @@ func (c *Syncer) Run() {
 			c.Shutdown()
 		case <-c.notifyShutdownCh:
 			sync.Stop()
-			c.logger.Printf("[INFO] consul.syncer: shutting down sync for %q", c.serviceRegPrefix)
+			c.logger.Printf("[INFO] consul.syncer: shutting down sync for %+q", c.serviceRegPrefix)
 			return
 		}
 	}
@@ -874,7 +874,7 @@ func (c *Syncer) runCheck(check Check) {
 	}
 	if err := c.client.Agent().UpdateTTL(check.ID(), output, state); err != nil {
 		if c.consulAvailable {
-			c.logger.Printf("[DEBUG] consul.syncer: check %q failed, disabling Consul checks until until next successful sync: %v", check.ID(), err)
+			c.logger.Printf("[DEBUG] consul.syncer: check %+q failed, disabling Consul checks until until next successful sync: %v", check.ID(), err)
 			c.consulAvailable = false
 		} else {
 			c.consulAvailable = true
@@ -888,7 +888,7 @@ func (c *Syncer) AddPeriodicHandler(name string, fn types.PeriodicCallback) bool
 	c.periodicLock.Lock()
 	defer c.periodicLock.Unlock()
 	if _, found := c.periodicCallbacks[name]; found {
-		c.logger.Printf("[ERROR] consul.syncer: failed adding handler %q", name)
+		c.logger.Printf("[ERROR] consul.syncer: failed adding handler %+q", name)
 		return false
 	}
 	c.periodicCallbacks[name] = fn