Merge pull request #1269 from lightninglabs/improve-logging

Improve logging

Author: ffranr

fn/option.go

@@ -1,12 +1,23 @@
 package fn
 
-// Option[A] represents a value which may or may not be there. This is very
+import "fmt"
+
+// Option represents a value which may or may not be there. This is very
 // often preferable to nil-able pointers.
 type Option[A any] struct {
 	isSome bool
 	some   A
 }
 
+// String returns a string representation of the Option.
+func (o Option[A]) String() string {
+	if o.isSome {
+		return fmt.Sprintf("Some(%v)", o.some)
+	}
+
+	return "None"
+}
+
 // Some trivially injects a value into an optional context.
 //
 // Some : A -> Option[A].

rfq/negotiator.go

@@ -119,6 +119,11 @@ func (n *Negotiator) queryBidFromPriceOracle(assetSpecifier asset.Specifier,
 	ctx, cancel := n.WithCtxQuitNoTimeout()
 	defer cancel()
 
+	log.Debugf("Querying price oracle for bid price (asset_specifier=%s, "+
+		"asset_max_amt=%s, payment_max_amt=%s, asset_rate_hint=%s)",
+		assetSpecifier.String(), assetMaxAmt.String(),
+		paymentMaxAmt.String(), assetRateHint.String())
+
 	oracleResponse, err := n.cfg.PriceOracle.QueryBidPrice(
 		ctx, assetSpecifier, assetMaxAmt, paymentMaxAmt, assetRateHint,
 	)
@@ -240,6 +245,11 @@ func (n *Negotiator) queryAskFromPriceOracle(assetSpecifier asset.Specifier,
 	ctx, cancel := n.WithCtxQuitNoTimeout()
 	defer cancel()
 
+	log.Debugf("Querying price oracle for ask price (asset_specifier=%s, "+
+		"asset_max_amt=%s, payment_max_amt=%s, asset_rate_hint=%s)",
+		assetSpecifier.String(), assetMaxAmt.String(),
+		paymentMaxAmt.String(), assetRateHint.String())
+
 	oracleResponse, err := n.cfg.PriceOracle.QueryAskPrice(
 		ctx, assetSpecifier, assetMaxAmt, paymentMaxAmt,
 		assetRateHint,
@@ -439,7 +449,7 @@ func (n *Negotiator) HandleIncomingSellRequest(
 			sendOutgoingMsg(msg)
 
 			// Add an error to the error channel and return.
-			err = fmt.Errorf("failed to query ask price from "+
+			err = fmt.Errorf("failed to query bid price from "+
 				"oracle: %w", err)
 			n.cfg.ErrChan <- err
 			return

server.go

@@ -997,8 +997,8 @@ func (s *Server) ChannelFinalized(pid funding.PendingChanID) error {
 func (s *Server) ShouldHandleTraffic(cid lnwire.ShortChannelID,
 	fundingBlob lfn.Option[tlv.Blob]) (bool, error) {
 
-	srvrLog.Debugf("HandleTraffic called, cid=%v, fundingBlob=%v", cid,
-		spew.Sdump(fundingBlob))
+	srvrLog.Debugf("HandleTraffic called (cid=%v, fundingBlob=%x)", cid,
+		fundingBlob.UnwrapOr(tlv.Blob{}))
 
 	if err := s.waitForReady(); err != nil {
 		return false, err

tapchannel/aux_funding_controller.go

@@ -2218,8 +2218,8 @@ func (f *FundingController) CanHandle(msg msgmux.PeerMsg) bool {
 		return true
 	}
 
-	log.Debugf("Failed to handle: %T", msg.Message)
-
+	log.Tracef("FundingController encountered an unsupported message "+
+		"type: %T", msg.Message)
 	return false
 }
 

universe/auto_syncer.go

@@ -199,7 +199,7 @@ func (f *FederationEnvoy) Stop() error {
 func (f *FederationEnvoy) syncServerState(ctx context.Context,
 	addr ServerAddr, syncConfigs SyncConfigs) error {
 
-	log.Infof("Syncing Universe state with server=%v", spew.Sdump(addr))
+	log.Infof("Syncing Universe state with server=%s", addr.HostStr())
 
 	// Attempt to sync with the remote Universe server, if this errors then
 	// we'll bail out early as something wrong happened.