Skip to content

Commit 9c4f731

Browse files
committed
add logs
Signed-off-by: Fedor Partanskiy <fredprtnsk@gmail.com>
1 parent 597082c commit 9c4f731

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

pkg/chproducer/ledger.go

+15-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ func (h *Handler) queryChannelTransfers(ctx context.Context) ([]*fpb.CCTransfer,
2626

2727
transfers := make([]*fpb.CCTransfer, 0)
2828
bookmark := ""
29+
h.log.Debugf("query channel transfers from, channel %s", h.chaincodeID)
2930

3031
for {
3132
resp, err := executor.Query(
@@ -65,6 +66,7 @@ func (h *Handler) queryChannelTransfers(ctx context.Context) ([]*fpb.CCTransfer,
6566
func (h *Handler) createTransferFrom(ctx context.Context, request model.TransferRequest) (model.StatusKind, error) {
6667
startTime := time.Now()
6768

69+
h.log.Debugf("create cc transfer from, channel %s, id %s, method %s", h.chaincodeID, request.Transfer, request.Method)
6870
doer, err := h.poolController.Executor(h.channel)
6971
if err != nil {
7072
return model.InternalErrorTransferStatus, errors.Errorf("executor: %w", err)
@@ -92,8 +94,8 @@ func (h *Handler) createTransferFrom(ctx context.Context, request model.Transfer
9294
for _, arg := range args {
9395
tArgs = append(tArgs, string(arg))
9496
}
95-
h.log.Debugf("transfer request arguments: %+v", tArgs)
9697

98+
h.log.Debugf("transfer request arguments: %+v", tArgs)
9799
_, err = doer.Invoke(
98100
ctx,
99101
channel.Request{
@@ -119,6 +121,8 @@ func (h *Handler) createTransferFrom(ctx context.Context, request model.Transfer
119121

120122
func (h *Handler) createTransferTo(ctx context.Context, transfer *fpb.CCTransfer) (model.StatusKind, error) {
121123
channelName := strings.ToLower(transfer.GetTo())
124+
h.log.Debugf("create cc transfer to, channel %s, id %s", channelName, transfer.GetId())
125+
122126
if status, err := h.expandTO(ctx, channelName); err != nil {
123127
return status, err
124128
}
@@ -150,6 +154,8 @@ func (h *Handler) createTransferTo(ctx context.Context, transfer *fpb.CCTransfer
150154
}
151155

152156
func (h *Handler) cancelTransferFrom(ctx context.Context, transferID string) (model.StatusKind, error) {
157+
h.log.Debugf("cancel cc transfer from, channel %s, id %s", h.channel, transferID)
158+
153159
if err := h.invoke(ctx, h.channel, h.chaincodeID, model.TxCancelCCTransferFrom, transferID); err != nil {
154160
if strings.Contains(err.Error(), errTransferNotFound) {
155161
h.log.Error(errors.Errorf("cancel transfer: %w", err))
@@ -163,6 +169,8 @@ func (h *Handler) cancelTransferFrom(ctx context.Context, transferID string) (mo
163169
}
164170

165171
func (h *Handler) commitTransferFrom(ctx context.Context, transferID string) (model.StatusKind, error) {
172+
h.log.Debugf("commit cc transfer from, channel %s, id %s", h.channel, transferID)
173+
166174
if err := h.invoke(ctx, h.channel, h.chaincodeID, model.NbTxCommitCCTransferFrom, transferID); err != nil {
167175
if strings.Contains(err.Error(), errTransferNotFound) {
168176
h.log.Error(errors.Errorf("commit transfer: %w", err))
@@ -175,6 +183,8 @@ func (h *Handler) commitTransferFrom(ctx context.Context, transferID string) (mo
175183
}
176184

177185
func (h *Handler) deleteTransferFrom(ctx context.Context, transferID string) (model.StatusKind, error) {
186+
h.log.Debugf("delete cc transfer from, channel %s, id %s", h.channel, transferID)
187+
178188
if err := h.invoke(ctx, h.channel, h.chaincodeID, model.NbTxDeleteCCTransferFrom, transferID); err != nil {
179189
if strings.Contains(err.Error(), errTransferNotFound) {
180190
h.log.Error(errors.Errorf("delete transfer: %w", err))
@@ -187,6 +197,8 @@ func (h *Handler) deleteTransferFrom(ctx context.Context, transferID string) (mo
187197
}
188198

189199
func (h *Handler) deleteTransferTo(ctx context.Context, channelName string, transferID string) (model.StatusKind, error) {
200+
h.log.Debugf("delete cc transfer to, channel %s, id %s", channelName, transferID)
201+
190202
if err := h.invoke(ctx, channelName, channelName, model.NbTxDeleteCCTransferTo, transferID); err != nil {
191203
if strings.Contains(err.Error(), errTransferNotFound) {
192204
h.log.Error(errors.Errorf("delete transfer: %w", err))
@@ -226,6 +238,7 @@ func (h *Handler) queryChannelTransferTo(ctx context.Context, channelName string
226238
return false, errors.Errorf("expand: %w", err)
227239
}
228240

241+
h.log.Debugf("query channel transfer to, channel %s, id %s", channelName, transferID)
229242
_, err = executor.Query(
230243
ctx,
231244
channel.Request{
@@ -252,6 +265,7 @@ func (h *Handler) queryChannelTransferFrom(ctx context.Context, channelName stri
252265
return false, errors.Errorf("expand: %w", err)
253266
}
254267

268+
h.log.Debugf("query channel transfer from, channel %s, id %s", channelName, transferID)
255269
_, err = executor.Query(
256270
ctx,
257271
channel.Request{

pkg/chproducer/methods.go

+4
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ func (h *Handler) transferProcessing(ctx context.Context, initStatus model.Statu
9595
failTag = expiredTransferTag
9696
}
9797

98+
h.log.Debugf("event status %s, id %s, channel from %s, channel to %s",
99+
status.String(), transfer.GetId(), transfer.GetFrom(), transfer.GetTo(),
100+
)
101+
98102
switch status {
99103
case model.InProgressTransferFrom:
100104
if lastErr != nil {

0 commit comments

Comments
 (0)