From 82e1efb518c4f1fedb1f49a3f4a0235521b3087c Mon Sep 17 00:00:00 2001 From: krau <71133316+krau@users.noreply.github.com> Date: Mon, 19 Jan 2026 21:34:57 +0800 Subject: [PATCH] refactor: update logging messages for transfer task execution and progress tracking --- core/tasks/transfer/execute.go | 8 ++++---- core/tasks/transfer/progress.go | 13 ++++++++----- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/core/tasks/transfer/execute.go b/core/tasks/transfer/execute.go index b4ce8f8..dc57da6 100644 --- a/core/tasks/transfer/execute.go +++ b/core/tasks/transfer/execute.go @@ -17,8 +17,8 @@ import ( // Execute implements core.Executable. func (t *Task) Execute(ctx context.Context) error { - logger := log.FromContext(ctx).WithPrefix(fmt.Sprintf("batch_import[%s]", t.ID)) - logger.Info("Starting batch import task") + logger := log.FromContext(ctx).WithPrefix(fmt.Sprintf("transfer[%s]", t.ID)) + logger.Info("Starting transfer task") t.Progress.OnStart(ctx, t) workers := config.C().Workers @@ -60,9 +60,9 @@ func (t *Task) Execute(ctx context.Context) error { err := eg.Wait() if err != nil { - logger.Errorf("Error during batch import processing: %v", err) + logger.Errorf("Error during transfer processing: %v", err) } else { - logger.Info("Batch import task completed successfully") + logger.Info("Transfer task completed successfully") } t.Progress.OnDone(ctx, t, err) diff --git a/core/tasks/transfer/progress.go b/core/tasks/transfer/progress.go index fd836fa..2852524 100644 --- a/core/tasks/transfer/progress.go +++ b/core/tasks/transfer/progress.go @@ -40,7 +40,7 @@ func NewProgressTracker(messageID int, chatID int64) ProgressTracker { func (p *Progress) OnStart(ctx context.Context, info TaskInfo) { p.start = time.Now() p.lastUpdatePercent.Store(0) - log.FromContext(ctx).Debugf("Batch import task progress tracking started for message %d in chat %d", p.MessageID, p.ChatID) + log.FromContext(ctx).Debugf("Transfer task progress tracking started for message %d in chat %d", p.MessageID, p.ChatID) sizeMB := float64(info.TotalSize()) / (1024 * 1024) statsText := i18n.T(i18nk.BotMsgTransferStartStats, map[string]any{ @@ -75,7 +75,10 @@ func (p *Progress) OnStart(ctx context.Context, info TaskInfo) { ext := tgutil.ExtFromContext(ctx) if ext != nil { - ext.EditMessage(p.ChatID, req) + _, err := ext.EditMessage(p.ChatID, req) + if err != nil { + log.FromContext(ctx).Errorf("Failed to send progress start message: %s", err) + } } } @@ -98,8 +101,8 @@ func (p *Progress) OnProgress(ctx context.Context, info TaskInfo) { fmt.Fprintf(&progressText, "%d%%", percent) progressText.WriteString(i18n.T(i18nk.BotMsgProgressTransferUploadedPrefix, nil)) fmt.Fprintf(&progressText, "%.2f MB / %.2f MB", - float64(info.Uploaded())/(1024*1024), - float64(info.TotalSize())/(1024*1024)) + float64(info.Uploaded())/(1024*1024), + float64(info.TotalSize())/(1024*1024)) if p.start.Unix() > 0 { elapsed := time.Since(p.start) @@ -156,7 +159,7 @@ func (p *Progress) OnProgress(ctx context.Context, info TaskInfo) { } func (p *Progress) OnDone(ctx context.Context, info TaskInfo, err error) { - log.FromContext(ctx).Debugf("Batch import task progress tracking done for message %d in chat %d", p.MessageID, p.ChatID) + log.FromContext(ctx).Debugf("Transfer task progress tracking done for message %d in chat %d", p.MessageID, p.ChatID) entityBuilder := entity.Builder{} var resultText strings.Builder