Merge pull request #143 from LNOpenMetrics/macros/update_cache

fix: fix json - struct mapping
LNOpenMetrics · Jun 12, 2023 · 5ad4c0f · 5ad4c0f
2 parents b0c28e6 + 33402cf
commit 5ad4c0f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/internal/metrics/metrics_one.go b/internal/metrics/metrics_one.go
@@ -612,7 +612,9 @@ func (instance *RawLocalScore) collectInfoChannel(lightning cln4go.Client,
 
 		infoMap, err := instance.getChannelInfo(lightning, channel, infoChannel)
 		if err != nil {
-			log.GetInstance().Error(fmt.Sprintf("Error during get the information about the channel: %s", err))
+			log.GetInstance().Errorf("Error during get the information about the channel: %s", err)
+			str, _ := instance.Encoder.EncodeToString(channel)
+			log.GetInstance().Errorf("channel under analysis: `%s`", *str)
 			return err
 		}
 

diff --git a/pkg/model/model.go b/pkg/model/model.go
@@ -50,7 +50,11 @@ func ParseDeprecatedMsat(msat any) uint64 {
 	if msat != nil {
 		switch val := msat.(type) {
 		case string:
-			res, _ := ParseMsatStrToInt(&val)
+			res, err := ParseMsatStrToInt(&val)
+			if err != nil {
+				log.GetInstance().Errorf("parsing msat string fails with error %s", err)
+				log.GetInstance().Errorf("original value is %s", val)
+			}
 			return res
 		default:
 			res, _ := val.(float64)
@@ -106,8 +110,8 @@ type ListChannelsChannel struct {
 	LastUpdate          uint64 `json:"last_update"`
 	BaseFeeMillisatoshi uint64 `json:"base_fee_millisatoshi"`
 	FeePerMillionth     uint64 `json:"fee_per_millionth"`
-	HtlcMinimumMsat     uint64 `json:"minimum_htlc_out_msat"`
-	HtlcMaximumMsat     uint64 `json:"maximum_htlc_out_msat"`
+	HtlcMinimumMsat     uint64 `json:"minimum_htlc_msat"`
+	HtlcMaximumMsat     uint64 `json:"maximum_htlc_msat"`
 }
 
 func (self *ListChannelsChannel) HtlcMinMsat() *string {