Use ForceFormatting to include prefix in file based logging (CMC-1497) (

#138)

* improved clarity of conn deregistered on ones not fully authenticated

glide.yaml

@@ -22,8 +22,8 @@ import:
   version: ^1.5.0
 - package: github.com/fsnotify/fsnotify
   version: ^1.4.2
-- package: github.com/x-cray/logrus-prefixed-formatter
-  version: ~0.3.2
+- package: github.com/racker/logrus-prefixed-formatter
+  version: force-formatter
 - package: github.com/mgutz/ansi
 - package: github.com/jpillora/backoff
 - package: github.com/prometheus/client_golang

poller.go

@@ -30,7 +30,7 @@ import (
 	"time"
 
 	log "github.com/Sirupsen/logrus"
-	prefixed "github.com/x-cray/logrus-prefixed-formatter"
+	prefixed "github.com/racker/logrus-prefixed-formatter"
 
 	"github.com/racker/rackspace-monitoring-poller/commands"
 	"github.com/racker/rackspace-monitoring-poller/version"
@@ -82,6 +82,7 @@ func initEnv() {
 	} else {
 		log.SetFormatter(&prefixed.TextFormatter{
 			TimestampFormat: time.RFC1123,
+			ForceFormatting: true,
 		})
 	}
 	if globalFlags.LogfileName != "" {

poller/connection.go

@@ -153,6 +153,10 @@ func (conn *EleConnection) GetLogPrefix() string {
 	return conn.address
 }
 
+func (conn *EleConnection) String() string {
+	return conn.address
+}
+
 // Connect sets up a tcp connection with connection defined address
 // and passed in tlsConfig
 // If context is not set, ErrUndefinedContext is returned

poller/connection_stream.go

@@ -157,20 +157,28 @@ func (cs *EleConnectionStream) registerConnection(qry string, conn Connection) {
 }
 
 func (cs *EleConnectionStream) deregisterConnection(qry string, conn Connection) {
-	hadConnections := len(cs.conns) > 0
-	delete(cs.conns, qry)
-	log.WithField("connections", cs.conns).
-		Debug("After deregistring, currently registered connections")
-	cs.EmitEvent(utils.NewEvent(EventTypeDeregister, conn))
-
-	if hadConnections && len(cs.conns) == 0 {
+	if _, exists := cs.conns[qry]; exists {
+		delete(cs.conns, qry)
 		log.WithFields(log.Fields{
-			"prefix": "scheduler",
-		}).Info("Lost all connections to endpoints")
+			"prefix":      cs.GetLogPrefix(),
+			"connections": cs.conns,
+		}).Debug("After deregistering, currently registered connections")
+
+		cs.EmitEvent(utils.NewEvent(EventTypeDeregister, conn))
+		if len(cs.conns) == 0 {
+			log.WithFields(log.Fields{
+				"prefix": "scheduler",
+			}).Info("Lost all connections to endpoints")
 
-		for _, scheduler := range cs.schedulers {
-			scheduler.Reset()
+			for _, scheduler := range cs.schedulers {
+				scheduler.Reset()
+			}
 		}
+	} else {
+		log.WithFields(log.Fields{
+			"prefix":     cs.GetLogPrefix(),
+			"connection": conn,
+		}).Debug("Saw deregistration, but connection wasn't fully ready.")
 	}
 }