Use the Stringer interface to output discovery id

Author: cmaglie

client.go

@@ -127,7 +127,7 @@ func (disc *Client) jsonDecodeLoop(in io.Reader, outChan chan<- *discoveryMessag
 		disc.incomingMessagesError = err
 		disc.statusMutex.Unlock()
 		close(outChan)
-		disc.logger.Errorf("stopped discovery %s decode loop: %v", disc.id, err)
+		disc.logger.Errorf("stopped discovery %s decode loop: %v", disc, err)
 	}
 
 	for {
@@ -143,7 +143,7 @@ func (disc *Client) jsonDecodeLoop(in io.Reader, outChan chan<- *discoveryMessag
 			closeAndReportError(err)
 			return
 		}
-		disc.logger.Infof("from discovery %s received message %s", disc.id, msg)
+		disc.logger.Infof("from discovery %s received message %s", disc, msg)
 		if msg.EventType == "add" {
 			if msg.Port == nil {
 				closeAndReportError(errors.New("invalid 'add' message: missing port"))
@@ -178,7 +178,7 @@ func (disc *Client) waitMessage(timeout time.Duration) (*discoveryMessage, error
 		}
 		return msg, nil
 	case <-time.After(timeout):
-		return nil, fmt.Errorf("timeout waiting for message from %s", disc.id)
+		return nil, fmt.Errorf("timeout waiting for message from %s", disc)
 	}
 }
 
@@ -198,7 +198,7 @@ func (disc *Client) sendCommand(command string) error {
 }
 
 func (disc *Client) runProcess() error {
-	disc.logger.Infof("starting discovery %s process", disc.id)
+	disc.logger.Infof("starting discovery %s process", disc)
 	proc, err := paths.NewProcess(nil, disc.processArgs...)
 	if err != nil {
 		return err
@@ -224,12 +224,12 @@ func (disc *Client) runProcess() error {
 	disc.statusMutex.Lock()
 	defer disc.statusMutex.Unlock()
 	disc.process = proc
-	disc.logger.Infof("started discovery %s process", disc.id)
+	disc.logger.Infof("started discovery %s process", disc)
 	return nil
 }
 
 func (disc *Client) killProcess() error {
-	disc.logger.Infof("killing discovery %s process", disc.id)
+	disc.logger.Infof("killing discovery %s process", disc)
 	if disc.process != nil {
 		if err := disc.process.Kill(); err != nil {
 			return err
@@ -241,7 +241,7 @@ func (disc *Client) killProcess() error {
 	disc.statusMutex.Lock()
 	defer disc.statusMutex.Unlock()
 	disc.stopSync()
-	disc.logger.Infof("killed discovery %s process", disc.id)
+	disc.logger.Infof("killed discovery %s process", disc)
 	return nil
 }
 
@@ -263,7 +263,7 @@ func (disc *Client) Run() (err error) {
 		if err := disc.killProcess(); err != nil {
 			// Log failure to kill the process, ideally that should never happen
 			// but it's best to know it if it does
-			disc.logger.Errorf("Killing discovery %s after unsuccessful start: %s", disc.id, err)
+			disc.logger.Errorf("Killing discovery %s after unsuccessful start: %s", disc, err)
 		}
 	}()
 
@@ -340,7 +340,7 @@ func (disc *Client) stopSync() {
 func (disc *Client) Quit() {
 	_ = disc.sendCommand("QUIT\n")
 	if _, err := disc.waitMessage(time.Second * 5); err != nil {
-		disc.logger.Errorf("Quitting discovery %s: %s", disc.id, err)
+		disc.logger.Errorf("Quitting discovery %s: %s", disc, err)
 	}
 	disc.stopSync()
 	disc.killProcess()