Merge pull request #281 from ploxiln/refactor_logfmt

minor cleanup of log format handling for per-level logger

Author: jehiah

conn.go

@@ -125,12 +125,12 @@ func (c *Conn) SetLogger(l logger, lvl LogLevel, format string) {
 	c.logGuard.Lock()
 	defer c.logGuard.Unlock()
 
+	if format == "" {
+		format = "(%s)"
+	}
 	for level := range c.logger {
 		c.logger[level] = l
 		c.logFmt[level] = format
-		if c.logFmt[level] == "" {
-			c.logFmt[level] = "(%s)"
-		}
 	}
 	c.logLvl = lvl
 }
@@ -139,6 +139,9 @@ func (c *Conn) SetLoggerForLevel(l logger, lvl LogLevel, format string) {
 	c.logGuard.Lock()
 	defer c.logGuard.Unlock()
 
+	if format == "" {
+		format = "(%s)"
+	}
 	c.logger[lvl] = l
 	c.logFmt[lvl] = format
 }

consumer.go

@@ -557,9 +557,9 @@ func (r *Consumer) ConnectToNSQD(addr string) error {
 
 	conn := NewConn(addr, &r.config, &consumerConnDelegate{r})
 	conn.SetLoggerLevel(r.getLogLevel())
+	format := fmt.Sprintf("%3d [%s/%s] (%%s)", r.id, r.topic, r.channel)
 	for index := range r.logger {
-		conn.SetLoggerForLevel(r.logger[index], LogLevel(index),
-			fmt.Sprintf("%3d [%s/%s] (%%s)", r.id, r.topic, r.channel))
+		conn.SetLoggerForLevel(r.logger[index], LogLevel(index), format)
 	}
 	r.mtx.Lock()
 	_, pendingOk := r.pendingConnections[addr]

producer.go

@@ -308,8 +308,9 @@ func (w *Producer) connect() error {
 
 	w.conn = NewConn(w.addr, &w.config, &producerConnDelegate{w})
 	w.conn.SetLoggerLevel(w.getLogLevel())
+	format := fmt.Sprintf("%3d (%%s)", w.id)
 	for index := range w.logger {
-		w.conn.SetLoggerForLevel(w.logger[index], LogLevel(index), fmt.Sprintf("%3d (%%s)", w.id))
+		w.conn.SetLoggerForLevel(w.logger[index], LogLevel(index), format)
 	}
 
 	_, err := w.conn.Connect()