Improve logs
This commit is contained in:
@@ -68,6 +68,9 @@ func (c *TelegramController) Start() {
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
author := update.Message.From.String()
|
||||||
|
c.logger.Info("New incoming message", "author", author)
|
||||||
|
|
||||||
// Handle commands
|
// Handle commands
|
||||||
if update.Message.IsCommand() {
|
if update.Message.IsCommand() {
|
||||||
// Extract the command from the Message
|
// Extract the command from the Message
|
||||||
|
@@ -39,12 +39,12 @@ func (w *CallbackWorker) Name() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (w *CallbackWorker) Start(ctx context.Context) {
|
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 {
|
for {
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
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
|
return
|
||||||
default:
|
default:
|
||||||
err := w.f()
|
err := w.f()
|
||||||
@@ -53,13 +53,13 @@ func (w *CallbackWorker) Start(ctx context.Context) {
|
|||||||
metrics.WorkerJobCounter.WithLabelValues(w.Name(), strconv.FormatBool(err != nil)).Inc()
|
metrics.WorkerJobCounter.WithLabelValues(w.Name(), strconv.FormatBool(err != nil)).Inc()
|
||||||
}
|
}
|
||||||
if err != nil && !isNoop {
|
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 секунду перед следующей итерацией
|
// Ждем 1 секунду перед следующей итерацией
|
||||||
select {
|
select {
|
||||||
case <-ctx.Done():
|
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
|
return
|
||||||
case <-time.After(1 * time.Second):
|
case <-time.After(1 * time.Second):
|
||||||
// Продолжаем работу
|
// Продолжаем работу
|
||||||
|
4
main.go
4
main.go
@@ -125,7 +125,7 @@ func main() {
|
|||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
logger.Info("Starting Telegram bot")
|
logger.Info("Starting Telegram bot")
|
||||||
tgController.Start()
|
tgController.Start()
|
||||||
logger.Info("Telegram bot stopped")
|
logger.Info("Telegram bot stopped gracefully")
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,7 +146,7 @@ func main() {
|
|||||||
go func(worker worker.Worker) {
|
go func(worker worker.Worker) {
|
||||||
defer wg.Done()
|
defer wg.Done()
|
||||||
worker.Start(ctx)
|
worker.Start(ctx)
|
||||||
logger.Info("Worker stopped", "worker_name", worker.Name())
|
logger.Info("Worker stopped gracefully", "worker", worker.Name())
|
||||||
}(w)
|
}(w)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user