Merge branch 'master' into concept_store_support

Financial-Times · Mar 29, 2017 · 425da23 · 425da23
2 parents c38916c + fc4de10
commit 425da23
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/main.go b/main.go
@@ -184,7 +184,6 @@ func runServer(port string, resourcePath string, awsRegion string, bucketName st
 		go c.Start()
 		defer c.Stop()
 	}
-
 	if err := http.ListenAndServe(":"+port, nil); err != nil {
 		log.Fatalf("Unable to start server: %v", err)
 	}

diff --git a/service/processor.go b/service/processor.go
@@ -48,7 +48,7 @@ func (r *S3QProcessor) ProcessMsg(m consumer.Message) {
 	var km KafkaMsg
 	b := []byte(m.Body)
 	if err := json.Unmarshal(b, &km); err != nil {
-		log.Errorf("Could not unmarshall message with ID=%v, error=%v", m.Headers["Message-Id"], err.Error())
+		log.Errorf("Could not unmarshall message with ID=%v, transaction_id=%v, error=%v", m.Headers["Message-Id"], tid, err.Error())
 		return
 	}