From 56a4d4957bdf339fd95c5c7f49a1cebce3441722 Mon Sep 17 00:00:00 2001 From: Ruslan Penkrat Date: Thu, 23 Sep 2021 15:17:24 +0300 Subject: [PATCH] change log level --- .../stbf/impl/pengrad/BotResponseImpl.java | 24 ++++++++++++------- .../stbf/impl/pengrad/PengradTelegramBot.java | 2 ++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotResponseImpl.java b/stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotResponseImpl.java index 2d5a451..ad0078c 100644 --- a/stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotResponseImpl.java +++ b/stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/BotResponseImpl.java @@ -11,6 +11,7 @@ import com.pengrad.telegrambot.request.AbstractSendRequest; import com.pengrad.telegrambot.request.DeleteMessage; import com.pengrad.telegrambot.request.EditMessageText; import com.pengrad.telegrambot.request.SendDocument; +import com.pengrad.telegrambot.response.BaseResponse; import com.pengrad.telegrambot.response.SendResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -27,7 +28,7 @@ public class BotResponseImpl implements BotResponse { @Override public void send(Screen screen) { - log.debug("Send message: \n============\n{}\n============", screen.getText().trim()); + log.trace("Send trace: \n============\n{}\n============", screen.getText().trim()); AbstractSendRequest sendMessage = SendMethodUtils.createFromScreen(chatId(), screen); @@ -36,8 +37,8 @@ public class BotResponseImpl implements BotResponse { KeyboardButton[][] keyboard = kk.getKeyboard(); InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard(); - if (log.isDebugEnabled()) { - log.debug("{}", kk.toFriendlyString()); + if (log.isTraceEnabled()) { + log.trace("{}", kk.toFriendlyString()); } if (inlineKeyboard != null && inlineKeyboard.length > 0) { @@ -45,12 +46,14 @@ public class BotResponseImpl implements BotResponse { } else if (keyboard != null && keyboard.length > 0) { sendMessage = sendMessage.replyMarkup(new ReplyKeyboardMarkup(keyboard)); } else { - log.debug("No keyboard"); + log.trace("No keyboard"); } } final SendResponse sendResponse = telegramBot.execute(sendMessage); SendMethodUtils.processResponse(screen, sendResponse); + + log.debug("Response message = {}", sendResponse.message().messageId()); } @Override @@ -76,18 +79,23 @@ public class BotResponseImpl implements BotResponse { KeyboardImpl kk = (KeyboardImpl) screen.getKeyboard(); InlineKeyboardButton[][] inlineKeyboard = kk.getInlineKeyboard(); - if (log.isDebugEnabled()) { - log.debug("{}", kk.toFriendlyString()); + if (log.isTraceEnabled()) { + log.trace("{}", kk.toFriendlyString()); } if (inlineKeyboard != null && inlineKeyboard.length > 0) { editMessage = editMessage.replyMarkup(new InlineKeyboardMarkup(inlineKeyboard)); } else { - log.debug("No keyboard"); + log.trace("No keyboard"); } } - telegramBot.execute(editMessage); + final BaseResponse response = telegramBot.execute(editMessage); + if (response.isOk()) { + log.debug("Response ok, edit message = {}", messageId()); + } else { + log.debug("Response error code {}", response.errorCode()); + } } @Override diff --git a/stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/PengradTelegramBot.java b/stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/PengradTelegramBot.java index 151e6f7..d20203e 100644 --- a/stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/PengradTelegramBot.java +++ b/stbf-pengrad/src/main/java/ru/penkrat/stbf/impl/pengrad/PengradTelegramBot.java @@ -29,6 +29,8 @@ public class PengradTelegramBot extends TelegramBot implements AutoCloseable { .map(CallbackQuery::message) .orElseGet(() -> update.message()).chat().id(); + log.debug("New message in chat {}", chatId); + commandChain.processCommand( new BotRequestImpl(update, sessionProvider.get(chatId)), new BotResponseImpl(update, this));