From 03c20d0de5c9a9d397983f6c0f3f91be5bb4e7f1 Mon Sep 17 00:00:00 2001 From: BennyThink Date: Fri, 14 Jan 2022 19:15:05 +0800 Subject: [PATCH] enable audio, add metrics from redis --- ytdlbot/db.py | 18 ++++++++++++++++++ ytdlbot/tasks.py | 4 +--- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ytdlbot/db.py b/ytdlbot/db.py index 230fbd0..fe054a5 100644 --- a/ytdlbot/db.py +++ b/ytdlbot/db.py @@ -237,9 +237,27 @@ class InfluxDB: ] self.client.write_points(json_body) + def __fill_redis_metrics(self): + json_body = [ + { + "measurement": "metrics", + "time": datetime.datetime.utcnow(), + "fields": { + } + } + ] + r = Redis().r + hash_keys = r.hgetall("metrics") + for key, value in hash_keys.items(): + if re.findall(r"^today", key): + json_body[0]["fields"][key] = int(value) + + self.client.write_points(json_body) + def collect_data(self): with contextlib.suppress(Exception): data = self.get_worker_data() self.__fill_worker_data(data) self.__fill_overall_data(data) + self.__fill_redis_metrics() logging.debug("InfluxDB data was collected.") diff --git a/ytdlbot/tasks.py b/ytdlbot/tasks.py index eb3e466..1e92886 100644 --- a/ytdlbot/tasks.py +++ b/ytdlbot/tasks.py @@ -63,9 +63,7 @@ def download_entrance(bot_msg, client, url): def audio_entrance(bot_msg): if ENABLE_CELERY: - normal_audio(bot_msg) - # disable celery audio conversion for now - # audio_task.delay(bot_msg.chat.id, bot_msg.message_id) + audio_task.delay(bot_msg.chat.id, bot_msg.message_id) else: normal_audio(bot_msg)