From 121585f8074c48c7d52c8736f1f7b97ee1db6f19 Mon Sep 17 00:00:00 2001 From: Anton Vakhrushev Date: Thu, 14 Aug 2025 11:08:31 +0300 Subject: [PATCH] Improve logs --- internal/controller/tg/tg.go | 3 +++ internal/controller/worker/worker.go | 8 ++++---- main.go | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/controller/tg/tg.go b/internal/controller/tg/tg.go index 86ca06e..118e1fe 100644 --- a/internal/controller/tg/tg.go +++ b/internal/controller/tg/tg.go @@ -68,6 +68,9 @@ func (c *TelegramController) Start() { continue } + author := update.Message.From.String() + c.logger.Info("New incoming message", "author", author) + // Handle commands if update.Message.IsCommand() { // Extract the command from the Message diff --git a/internal/controller/worker/worker.go b/internal/controller/worker/worker.go index 1c23af3..f045a0c 100644 --- a/internal/controller/worker/worker.go +++ b/internal/controller/worker/worker.go @@ -39,12 +39,12 @@ func (w *CallbackWorker) Name() string { } func (w *CallbackWorker) Start(ctx context.Context) { - w.logger.Info("Worker started", "worker_name", w.Name()) + w.logger.Info("Worker started", "worker", w.Name()) for { select { case <-ctx.Done(): - w.logger.Info("Worker received shutdown signal", "worker_name", w.Name()) + w.logger.Info("Worker received shutdown signal", "worker", w.Name()) return default: err := w.f() @@ -53,13 +53,13 @@ func (w *CallbackWorker) Start(ctx context.Context) { metrics.WorkerJobCounter.WithLabelValues(w.Name(), strconv.FormatBool(err != nil)).Inc() } if err != nil && !isNoop { - w.logger.Error("Worker error", "worker_name", w.Name(), "error", err) + w.logger.Error("Worker error", "worker", w.Name(), "error", err) } // Ждем 1 секунду перед следующей итерацией select { case <-ctx.Done(): - w.logger.Info("Worker received shutdown signal during sleep", "worker_name", w.Name()) + w.logger.Info("Worker received shutdown signal during sleep", "worker", w.Name()) return case <-time.After(1 * time.Second): // Продолжаем работу diff --git a/main.go b/main.go index 24f8fa0..ed3a7d0 100644 --- a/main.go +++ b/main.go @@ -125,7 +125,7 @@ func main() { defer wg.Done() logger.Info("Starting Telegram bot") tgController.Start() - logger.Info("Telegram bot stopped") + logger.Info("Telegram bot stopped gracefully") }() } @@ -146,7 +146,7 @@ func main() { go func(worker worker.Worker) { defer wg.Done() worker.Start(ctx) - logger.Info("Worker stopped", "worker_name", worker.Name()) + logger.Info("Worker stopped gracefully", "worker", worker.Name()) }(w) }