From 05646d6bbcb264cfb782122b6f52f4383fb95150 Mon Sep 17 00:00:00 2001
From: wagslane <lane.c.wagner@gmail.com>
Date: Mon, 20 Mar 2023 07:53:28 -0600
Subject: [PATCH] improve logs

---
 consume.go |  4 +++-
 publish.go | 27 +++++++++++++--------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/consume.go b/consume.go
index 3b4e850..d1f802f 100644
--- a/consume.go
+++ b/consume.go
@@ -94,7 +94,9 @@ func NewConsumer(
 				*options,
 			)
 			if err != nil {
-				consumer.options.Logger.Errorf("error restarting consumer goroutines after cancel or close: %v", err)
+				consumer.options.Logger.Fatalf("error restarting consumer goroutines after cancel or close: %v", err)
+				consumer.options.Logger.Fatalf("consumer closing, unable to recover")
+				return
 			}
 		}
 	}()
diff --git a/publish.go b/publish.go
index a0a490a..8954018 100644
--- a/publish.go
+++ b/publish.go
@@ -104,7 +104,19 @@ func NewPublisher(conn *Conn, optionFuncs ...func(*PublisherOptions)) (*Publishe
 		return nil, err
 	}
 
-	go publisher.handleRestarts()
+	go func() {
+		for err := range publisher.reconnectErrCh {
+			publisher.options.Logger.Infof("successful publisher recovery from: %v", err)
+			err := publisher.startup()
+			if err != nil {
+				publisher.options.Logger.Fatalf("error on startup for publisher after cancel or close: %v", err)
+				publisher.options.Logger.Fatalf("publisher closing, unable to recover")
+				return
+			}
+			go publisher.startReturnHandler()
+			go publisher.startPublishHandler()
+		}
+	}()
 
 	return publisher, nil
 }
@@ -119,19 +131,6 @@ func (publisher *Publisher) startup() error {
 	return nil
 }
 
-func (publisher *Publisher) handleRestarts() {
-	for err := range publisher.reconnectErrCh {
-		publisher.options.Logger.Infof("successful publisher recovery from: %v", err)
-		err := publisher.startup()
-		if err != nil {
-			publisher.options.Logger.Infof("failed to startup publisher: %v", err)
-			continue
-		}
-		go publisher.startReturnHandler()
-		go publisher.startPublishHandler()
-	}
-}
-
 /*
 Publish publishes the provided data to the given routing keys over the connection.
 */