From 3fc7d6b60a58fd057602c46576b1462515382bf9 Mon Sep 17 00:00:00 2001 From: Nathan Rijksen Date: Wed, 13 Sep 2023 10:22:06 -0700 Subject: [PATCH] Increased logging --- outputproducer.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/outputproducer.go b/outputproducer.go index 409b09d..fa98338 100644 --- a/outputproducer.go +++ b/outputproducer.go @@ -102,6 +102,7 @@ func (o *outputProducer) processNextRead(r io.Reader, w io.Writer, appendBuffer } func (o *outputProducer) appendBuffer(value []byte, isFinal bool) error { + o.opts.Logger.Printf("appendBuffer called with %d bytes, isFinal=%v", len(value), isFinal) if o.opts.NormalizedLineEnds { o.opts.Logger.Println("NormalizedLineEnds prior to appendBuffer") value = NormalizeLineEndsB(value) @@ -140,6 +141,9 @@ type cleanerFunc func([]byte, int) ([]byte, int, error) // So instead we only process new output up to the most recent line break // In order for this to work properly the invoker must ensure the output and cleanUptoPos are consistent with each other. func (o *outputProducer) processDirtyOutput(output []byte, cursorPos int, cleanUptoPos int, isFinal bool, cleaner cleanerFunc) (_output []byte, _cursorPos int, _cleanUptoPos int, _err error) { + defer func() { + o.opts.Logger.Printf("Cleaned output from %d to %d\n", cleanUptoPos, _cleanUptoPos) + }() alreadyCleanedOutput := copyBytes(output[:cleanUptoPos]) processedOutput := []byte{} unprocessedOutput := copyBytes(output[cleanUptoPos:]) @@ -174,10 +178,10 @@ func (o *outputProducer) processDirtyOutput(output []byte, cursorPos int, cleanU processedCursorPos += len(alreadyCleanedOutput) // Keep a record of what point we're up to - cleanUptoPos = cleanUptoPos + len(processedOutput) + newCleanUptoPos := cleanUptoPos + len(processedOutput) // Stitch everything back together - return append(append(alreadyCleanedOutput, processedOutput...), unprocessedOutput...), processedCursorPos, cleanUptoPos, nil + return append(append(alreadyCleanedOutput, processedOutput...), unprocessedOutput...), processedCursorPos, newCleanUptoPos, nil } func (o *outputProducer) flushConsumers() error {