view:fix logging

lovoo · Aug 13, 2019 · 4bd0eff · 4bd0eff
1 parent c12b6f3
commit 4bd0eff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/tester/queueconsumer.go b/tester/queueconsumer.go
@@ -171,7 +171,7 @@ func (qc *queueConsumer) addToBuffer(event kafka.Event) {
 	qc.eventBuffer <- event
 
 	if len(qc.eventBuffer) > eventBufferQueueSize*0.9 {
-		logger.Printf("buffer nearly full: %d, %s. Will drop events.", len(qc.eventBuffer), qc.queue.topic)
+		logger.Printf("buffer nearly full: %d, %s. Will drop event.", len(qc.eventBuffer), qc.queue.topic)
 		<-qc.eventBuffer
 	}
 }

diff --git a/tester/tester.go b/tester/tester.go
@@ -269,19 +269,18 @@ func (km *Tester) waitForConsumers() {
 }
 
 func (km *Tester) waitStartup() {
-	logger.Printf("Tester: Waiting for startup")
+	logger.Printf("Waiting for startup")
 	km.mQueues.RLock()
 	defer km.mQueues.RUnlock()
 	for _, queue := range km.topicQueues {
 		queue.waitConsumersInit()
 	}
-	logger.Printf("Tester: Waiting for startup done")
+	logger.Printf("Waiting for startup done")
 }
 
 // Consume a message using the topic's configured codec
 func (km *Tester) Consume(topic string, key string, msg interface{}) {
 	km.waitStartup()
-	log.Printf("startup")
 
 	// if the user wants to send a nil for some reason,
 	// just let her. Goka should handle it accordingly :)

diff --git a/view.go b/view.go
@@ -138,8 +138,8 @@ func (v *View) Run(ctx context.Context) error {
 	for id, p := range v.partitions {
 		pid, par := int32(id), p
 		errg.Go(func() error {
-			v.opts.log.Printf("view [%s]: partition %d started", pid)
-			defer v.opts.log.Printf("view: partition %d stopped", pid)
+			v.opts.log.Printf("view [%s]: partition %d started", v.Topic(), pid)
+			defer v.opts.log.Printf("view [%s]: partition %d stopped", v.Topic(), pid)
 			if err := par.st.Open(); err != nil {
 				return fmt.Errorf("view [%s]: error opening storage partition %d: %v", v.Topic(), pid, err)
 			}
@@ -155,7 +155,7 @@ func (v *View) Run(ctx context.Context) error {
 
 	v.opts.log.Printf("view [%s]: closing consumer", v.Topic())
 	if err := v.consumer.Close(); err != nil {
-		_ = errs.Collect(fmt.Errorf("view: failed closing consumer: %v", err))
+		_ = errs.Collect(fmt.Errorf("view [%s]: failed closing consumer: %v", v.Topic(), err))
 	}
 
 	if !v.opts.restartable {