Skip to content

🚀 feat: add structured logging and improve Telegram, Slack and Twitter alerts #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🚀 feat: add structured logging and improve Telegram, Slack and Twitter alerts #165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,22 @@
from telegram import Bot

import config
from logger import logger


def send_alert(data):
msg = data["msg"].encode("latin-1", "backslashreplace").decode("unicode_escape")

# ---------------- Telegram ---------------- #
if config.send_telegram_alerts:
tg_bot = Bot(token=config.tg_token)
try:
tg_bot.sendMessage(
data["telegram"],
msg,
parse_mode="MARKDOWN",
)
except KeyError:
tg_bot.sendMessage(
config.channel,
msg,
parse_mode="MARKDOWN",
)
chat_id = data.get("telegram", config.channel) # <-- uses .get() instead of try/except KeyError
tg_bot.sendMessage(chat_id, msg, parse_mode="MARKDOWN")
logger.info(f"Telegram alert sent to chat_id={chat_id}") # <-- NEW log for success
except Exception as e:
print("[X] Telegram Error:\n>", e)
logger.error(f"Telegram Error: {e}", exc_info=True) # <-- replaces print()


if config.send_discord_alerts:
try:
Expand All @@ -53,28 +49,29 @@ def send_alert(data):
except Exception as e:
print("[X] Discord Error:\n>", e)

# ---------------- Slack ---------------- #
if config.send_slack_alerts:
try:
slack = Slack(url="https://hooks.slack.com/services/" + data["slack"])
slack.post(text=msg)
except KeyError:
slack = Slack(
url="https://hooks.slack.com/services/" + config.slack_webhook
)
slack_url = "https://hooks.slack.com/services/" + data.get("slack", config.slack_webhook) # <-- .get()
slack = Slack(url=slack_url)
slack.post(text=msg)
logger.info("Slack alert sent successfully") # <-- NEW success log
except Exception as e:
print("[X] Slack Error:\n>", e)
logger.error(f"Slack Error: {e}", exc_info=True) # <-- replaces print()


# ---------------- Twitter ---------------- #
if config.send_twitter_alerts:
tw_auth = tweepy.OAuthHandler(config.tw_ckey, config.tw_csecret)
tw_auth.set_access_token(config.tw_atoken, config.tw_asecret)
tw_api = tweepy.API(tw_auth)
try:
tw_auth = tweepy.OAuthHandler(config.tw_ckey, config.tw_csecret)
tw_auth.set_access_token(config.tw_atoken, config.tw_asecret)
tw_api = tweepy.API(tw_auth)
tw_api.update_status(
status=msg.replace("*", "").replace("_", "").replace("`", "")
)
logger.info("Twitter alert posted successfully")
except Exception as e:
print("[X] Twitter Error:\n>", e)
logger.error(f"Twitter Error: {e}", exc_info=True)

if config.send_email_alerts:
try:
Expand Down