From bacb49ddbaad1c91154f8c2e6ccd8376e3f03659 Mon Sep 17 00:00:00 2001
From: yyforyongyu <yy2452@columbia.edu>
Date: Wed, 14 Jun 2023 06:09:11 +0800
Subject: [PATCH] peer+server: provide more verbose logging

---
 peer/brontide.go | 4 ++--
 server.go        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/peer/brontide.go b/peer/brontide.go
index 1b1534b2d..7866dbe3c 100644
--- a/peer/brontide.go
+++ b/peer/brontide.go
@@ -1099,7 +1099,7 @@ func (p *Brontide) readNextMessage() (lnwire.Message, error) {
 
 	pktLen, err := noiseConn.ReadNextHeader()
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("read next header: %w", err)
 	}
 
 	// First we'll read the next _full_ message. We do this rather than
@@ -1128,7 +1128,7 @@ func (p *Brontide) readNextMessage() (lnwire.Message, error) {
 		// pool.
 		rawMsg, readErr := noiseConn.ReadNextBody(buf[:pktLen])
 		if readErr != nil {
-			return readErr
+			return fmt.Errorf("read next body: %w", readErr)
 		}
 		msgLen = uint64(len(rawMsg))
 
diff --git a/server.go b/server.go
index 4719691e9..e28d8a757 100644
--- a/server.go
+++ b/server.go
@@ -4012,6 +4012,7 @@ func (s *server) peerTerminationWatcher(p *peer.Brontide, ready chan struct{}) {
 	// If the server is exiting then we can bail out early ourselves as all
 	// the other sub-systems will already be shutting down.
 	if s.Stopped() {
+		srvrLog.Debugf("Server quitting, exit early for peer %v", p)
 		return
 	}