Changelog: https://haproxy-wi.org/changelog.py#4_3_3
This commit is contained in:
Pavel Loginov
2020-07-02 16:44:13 +02:00
parent e8229080f0
commit d3dc41715e
6 changed files with 259 additions and 38 deletions

View File

@@ -95,8 +95,11 @@ def telegram_send_mess(mess, **kwargs):
import telebot
from telebot import apihelper
import sql
telegrams = sql.get_telegram_by_ip(kwargs.get('ip'))
if kwargs.get('telegram_channel_id'):
telegrams = sql.get_telegram_by_id(kwargs.get('telegram_channel_id'))
else:
telegrams = sql.get_telegram_by_ip(kwargs.get('ip'))
proxy = sql.get_setting('proxy')
for telegram in telegrams:
@@ -115,7 +118,7 @@ def telegram_send_mess(mess, **kwargs):
bot = telebot.TeleBot(token=token_bot)
bot.send_message(chat_id=channel_name, text=mess)
except Exception as e:
print(str(e).decode(encoding='UTF-8'))
print(str(e))
logging('localhost', str(e).decode(encoding='UTF-8'), haproxywi=1)
sys.exit()
@@ -1044,7 +1047,7 @@ def out_error(e):
error = e
else:
error = e.args[0]
print(error)
print('error: '+error)
def get_users_params(**kwargs):