From b456dec1385838279a0917b6542b9e0416a6d796 Mon Sep 17 00:00:00 2001
From: Harald Nordgren <haraldnordgren@gmail.com>
Date: Sun, 21 Oct 2018 18:12:47 +0200
Subject: [PATCH] Update formatting directive logic to unbreak tests

---
 mqtrigger/messageQueue/kafka.go | 12 ++++++------
 mqtrigger/messageQueue/nats.go  |  4 ++--
 redis/redis.go                  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mqtrigger/messageQueue/kafka.go b/mqtrigger/messageQueue/kafka.go
index 3fd0ab92..47b08ffa 100644
--- a/mqtrigger/messageQueue/kafka.go
+++ b/mqtrigger/messageQueue/kafka.go
@@ -46,7 +46,7 @@ func makeKafkaMessageQueue(routerUrl string, mqCfg MessageQueueConfig) (MessageQ
 		routerUrl: routerUrl,
 		brokers:   strings.Split(mqCfg.Url, ","),
 	}
-	log.Infof("Created Queue ", kafka)
+	log.Infof("Created Queue %q", kafka)
 	return kafka, nil
 }
 
@@ -55,15 +55,15 @@ func isTopicValidForKafka(topic string) bool {
 }
 
 func (kafka Kafka) subscribe(trigger *crd.MessageQueueTrigger) (messageQueueSubscription, error) {
-	log.Infof("Inside kakfa subscribe", trigger)
-	log.Infof("brokers set to ", kafka.brokers)
+	log.Infof("Inside kakfa subscribe %q", trigger)
+	log.Infof("brokers set to %q", kafka.brokers)
 
 	// Create new consumer
 	consumerConfig := cluster.NewConfig()
 	consumerConfig.Consumer.Return.Errors = true
 	consumerConfig.Group.Return.Notifications = true
 	consumer, err := cluster.NewConsumer(kafka.brokers, string(trigger.Metadata.UID), []string{trigger.Spec.Topic}, consumerConfig)
-	log.Infof("Created a new consumer ", consumer)
+	log.Infof("Created a new consumer: %#v", consumer)
 	if err != nil {
 		panic(err)
 	}
@@ -74,7 +74,7 @@ func (kafka Kafka) subscribe(trigger *crd.MessageQueueTrigger) (messageQueueSubs
 	producerConfig.Producer.Retry.Max = 10
 	producerConfig.Producer.Return.Successes = true
 	producer, err := sarama.NewSyncProducer(kafka.brokers, producerConfig)
-	log.Infof("Created a new producer ", producer)
+	log.Infof("Created a new producer %q", producer)
 	if err != nil {
 		panic(err)
 	}
@@ -141,7 +141,7 @@ func kafkaMsgHandler(kafka *Kafka, producer sarama.SyncProducer, trigger *crd.Me
 		// Make the request
 		resp, err = http.DefaultClient.Do(req)
 		if err != nil {
-			log.Error("Error invoking function for trigger %v: %v", trigger.Metadata.Name, err)
+			log.Errorf("Error invoking function for trigger %v: %v", trigger.Metadata.Name, err)
 			continue
 		}
 		if resp == nil {
diff --git a/mqtrigger/messageQueue/nats.go b/mqtrigger/messageQueue/nats.go
index 5d455aab..943ec461 100644
--- a/mqtrigger/messageQueue/nats.go
+++ b/mqtrigger/messageQueue/nats.go
@@ -130,7 +130,7 @@ func msgHandler(nats *Nats, trigger *crd.MessageQueueTrigger) func(*ns.Msg) {
 			// Make the request
 			resp, err = http.DefaultClient.Do(req)
 			if err != nil {
-				log.Error("Error invoking function for trigger %v: %v", trigger.Metadata.Name, err)
+				log.Errorf("Error invoking function for trigger %v: %v", trigger.Metadata.Name, err)
 				continue
 			}
 			if resp == nil {
@@ -160,7 +160,7 @@ func msgHandler(nats *Nats, trigger *crd.MessageQueueTrigger) func(*ns.Msg) {
 			if len(trigger.Spec.ErrorTopic) > 0 && len(body) > 0 {
 				publishErr := nats.nsConn.Publish(trigger.Spec.ErrorTopic, body)
 				if publishErr != nil {
-					log.Error("Failed to publish error to error topic: %v", publishErr)
+					log.Errorf("Failed to publish error to error topic: %v", publishErr)
 					// TODO: We will ack this message after max retries to prevent re-processing but
 					// this may cause message loss
 				}
diff --git a/redis/redis.go b/redis/redis.go
index cf2c0935..e82883c8 100644
--- a/redis/redis.go
+++ b/redis/redis.go
@@ -43,7 +43,7 @@ func NewClient() redis.Conn {
 
 	c, err := redis.Dial("tcp", redisUrl)
 	if err != nil {
-		log.Error("Could not connect to Redis: %v\n", err)
+		log.Errorf("Could not connect to Redis: %v\n", err)
 		return nil
 	}
 	return c