1 files changed, 17 insertions, 11 deletions
diff --git a/internal/clients/stats.go b/internal/clients/stats.go
index 7a6643b..1ce04e6 100644
--- a/internal/clients/stats.go
+++ b/internal/clients/stats.go
@@ -8,8 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mimecast/dtail/internal/color"
-	"github.com/mimecast/dtail/internal/config"
 	"github.com/mimecast/dtail/internal/io/dlog"
 	"github.com/mimecast/dtail/internal/protocol"
 )
@@ -24,13 +22,22 @@ type stats struct {
 	connected int
 	// To synchronize concurrent access.
 	mutex sync.Mutex
+	// Formats interrupt-driven stats output.
+	formatter interruptMessageFormatter
+	// Controls how long interrupt output remains visible.
+	interruptPause time.Duration
 }
 
-func newTailStats(servers int) *stats {
+func newTailStats(servers int, formatter interruptMessageFormatter, interruptPause time.Duration) *stats {
+	if interruptPause <= 0 {
+		interruptPause = 3 * time.Second
+	}
 	return &stats{
 		servers:          servers,
 		connectionsEstCh: make(chan struct{}, servers),
 		connected:        0,
+		formatter:        formatter,
+		interruptPause:   interruptPause,
 	}
 }
 
@@ -39,6 +46,9 @@ func newTailStats(servers int) *stats {
 func (s *stats) Start(ctx context.Context, throttleCh <-chan struct{},
 	statsCh <-chan string, quiet bool) {
 
+	ticker := time.NewTicker(3 * time.Second)
+	defer ticker.Stop()
+
 	var connectedLast int
 	for {
 		var force bool
@@ -48,7 +58,7 @@ func (s *stats) Start(ctx context.Context, throttleCh <-chan struct{},
 		case message := <-statsCh:
 			messages = append(messages, message)
 			force = true
-		case <-time.After(time.Second * 3):
+		case <-ticker.C:
 		case <-ctx.Done():
 			return
 		}
@@ -81,17 +91,13 @@ func (s *stats) Start(ctx context.Context, throttleCh <-chan struct{},
 func (s *stats) printStatsDueInterrupt(messages []string) {
 	dlog.Client.Pause()
 	for i, message := range messages {
-		if i > 0 && config.Client.TermColorsEnable {
-			fmt.Println(color.PaintStrWithAttr(message,
-				config.Client.TermColors.Client.ClientFg,
-				config.Client.TermColors.Client.ClientBg,
-				config.Client.TermColors.Client.ClientAttr,
-			))
+		if s.formatter != nil {
+			fmt.Println(s.formatter.FormatInterruptMessage(i, message))
 			continue
 		}
 		fmt.Printf(" %s\n", message)
 	}
-	time.Sleep(time.Second * time.Duration(config.InterruptTimeoutS))
+	time.Sleep(s.interruptPause)
 	dlog.Client.Resume()
 }