catspace-dev/unicheckbot
1
1
Fork 0
mirror of https://github.com/catspace-dev/unicheckbot.git synced 2025-06-05 22:23:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Send all checks result to NOTIFICATION_USERS if NOTIFY_CHECKS enabled

Browse Source
This commit is contained in:
kiriharu 2021-06-01 21:01:33 +03:00
parent aff843c867
commit 3ca281627f
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/tgbot/tgbot/config.py
View File

@ -13,6 +13,8 @@ INFLUX_DB = os.getenv("INFLUX_DB", None)
# Notifications # Notifications
NOTIFICATION_BOT_TOKEN = os.getenv("NOTIFICATION_BOT_TOKEN") NOTIFICATION_BOT_TOKEN = os.getenv("NOTIFICATION_BOT_TOKEN")
NOTIFICATION_USERS = os.getenv("NOTIFICATION_USERS", "").split(",") NOTIFICATION_USERS = os.getenv("NOTIFICATION_USERS", "").split(",")
# Send all checks result to NOTIFICATION_USERS
NOTIFY_CHECKS = True
# Mysql params # Mysql params
MYSQL_HOST = os.getenv("MYSQL_HOST", None) # if none, use sqlite db MYSQL_HOST = os.getenv("MYSQL_HOST", None) # if none, use sqlite db

9
apps/tgbot/tgbot/handlers/base.py
View File

@ -12,8 +12,9 @@ from loguru import logger
from ..middlewares.throttling import rate_limit from ..middlewares.throttling import rate_limit
from ..nodes import nodes as all_nodes from ..nodes import nodes as all_nodes
from .errors import InvalidPort, LocalhostForbidden, NotEnoughArgs from .errors import InvalidPort, LocalhostForbidden, NotEnoughArgs
from .helpers import send_api_requests from .helpers import send_api_requests, send_message_to_admins
from .validators import BaseValidator, LocalhostValidator from .validators import BaseValidator, LocalhostValidator
from ..config import NOTIFY_CHECKS
header = "Отчет о проверке хоста:" \ header = "Отчет о проверке хоста:" \
"\n\n— Хост: {0}"\ "\n\n— Хост: {0}"\
@ -68,6 +69,12 @@ class CheckerBaseHandler(SimpleCommandHandler):
node_formatted_response = await self.prepare_message(res) node_formatted_response = await self.prepare_message(res)
rsp_msg = await rsp_msg.edit_text(rsp_msg.text + f"\n\n{iter_keys}. {node_formatted_response}") rsp_msg = await rsp_msg.edit_text(rsp_msg.text + f"\n\n{iter_keys}. {node_formatted_response}")
iter_keys = iter_keys + 1 iter_keys = iter_keys + 1
if NOTIFY_CHECKS:
notify_text = f"**User {chat_id} issued check: {self.api_endpoint} for {data['target_fq']}**\n\n" \
f"```{rsp_msg.text}```"
await send_message_to_admins(notify_text)
logger.info(f"User {chat_id} ended check {ident}") logger.info(f"User {chat_id} ended check {ident}")
await rsp_msg.edit_text(rsp_msg.text + f"\n\nПроверка завершена❗") await rsp_msg.edit_text(rsp_msg.text + f"\n\nПроверка завершена❗")
te = time() te = time()