From e915a33219db379accea29a3330f876161d521e5 Mon Sep 17 00:00:00 2001
From: BennyThink <benny.think@gmail.com>
Date: Tue, 25 Jan 2022 09:32:42 +0800
Subject: [PATCH] add suicide to worker as well

---
 Dockerfile                                    |  2 +-
 .../{supervisor.conf => supervisor_main.conf} |  0
 conf/supervisor_worker.conf                   | 28 +++++++++++++++++++
 worker.yml                                    |  2 +-
 ytdlbot/tasks.py                              | 11 ++++++--
 ytdlbot/utils.py                              |  2 +-
 6 files changed, 40 insertions(+), 5 deletions(-)
 rename conf/{supervisor.conf => supervisor_main.conf} (100%)
 create mode 100644 conf/supervisor_worker.conf

diff --git a/Dockerfile b/Dockerfile
index b23e422..19b5095 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,4 +15,4 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY . /ytdlbot
 
-CMD ["/usr/local/bin/supervisord", "-c" ,"/ytdlbot/conf/supervisor.conf"]
\ No newline at end of file
+CMD ["/usr/local/bin/supervisord", "-c" ,"/ytdlbot/conf/supervisor_main.conf"]
\ No newline at end of file
diff --git a/conf/supervisor.conf b/conf/supervisor_main.conf
similarity index 100%
rename from conf/supervisor.conf
rename to conf/supervisor_main.conf
diff --git a/conf/supervisor_worker.conf b/conf/supervisor_worker.conf
new file mode 100644
index 0000000..6c4dccf
--- /dev/null
+++ b/conf/supervisor_worker.conf
@@ -0,0 +1,28 @@
+[supervisord]
+nodaemon=true
+logfile=/dev/null
+logfile_maxbytes=0
+user=root
+
+
+
+[program:worker]
+directory=/ytdlbot/ytdlbot/
+command=python tasks.py
+autorestart=true
+priority=900
+stopasgroup=true
+
+redirect_stderr=true
+stdout_logfile_maxbytes = 50MB
+stdout_logfile_backups = 2
+stdout_logfile = /var/log/ytdl.log
+
+[program:log]
+command=tail -f /var/log/ytdl.log
+autorestart=true
+priority=999
+
+redirect_stderr=true
+stdout_logfile=/dev/fd/1
+stdout_logfile_maxbytes=0
\ No newline at end of file
diff --git a/worker.yml b/worker.yml
index 02481a8..b9e418c 100644
--- a/worker.yml
+++ b/worker.yml
@@ -6,6 +6,6 @@ services:
     env_file:
       - env/ytdl.env
     restart: always
-    command: [ "python" ,"tasks.py" ]
+    command: ["/usr/local/bin/supervisord", "-c" ,"/ytdlbot/conf/supervisor_worker.conf"]
     volumes:
       - ./data/instagram.com_cookies.txt:/ytdlbot/ytdlbot/instagram.com_cookies.txt
\ No newline at end of file
diff --git a/ytdlbot/tasks.py b/ytdlbot/tasks.py
index d9a3772..986e773 100644
--- a/ytdlbot/tasks.py
+++ b/ytdlbot/tasks.py
@@ -20,6 +20,7 @@ import requests
 from celery import Celery
 from pyrogram import idle
 from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup
+from apscheduler.schedulers.background import BackgroundScheduler
 
 from client_init import create_app
 from config import BROKER, ENABLE_CELERY, ENABLE_VIP, OWNER, WORKERS
@@ -27,12 +28,13 @@ from constant import BotText
 from db import Redis
 from downloader import convert_flac, sizeof_fmt, upload_hook, ytdl_download
 from limit import VIP
-from utils import (apply_log_formatter, customize_logger, get_metadata,
-                   get_user_settings)
+from utils import (apply_log_formatter, auto_restart, customize_logger,
+                   get_metadata, get_user_settings)
 
 customize_logger(["pyrogram.client", "pyrogram.session.session", "pyrogram.connection.connection"])
 apply_log_formatter()
 bot_text = BotText()
+logging.getLogger('apscheduler.executors.default').propagate = False
 
 # celery -A tasks worker --loglevel=info --pool=solo
 # app = Celery('celery', broker=BROKER, accept_content=['pickle'], task_serializer='pickle')
@@ -240,5 +242,10 @@ if __name__ == '__main__':
     print("Bootstrapping Celery worker now.....")
     time.sleep(5)
     threading.Thread(target=run_celery, daemon=True).start()
+
+    scheduler = BackgroundScheduler(timezone="Asia/Shanghai")
+    scheduler.add_job(auto_restart, 'interval', seconds=5)
+    scheduler.start()
+
     idle()
     celery_client.stop()
diff --git a/ytdlbot/utils.py b/ytdlbot/utils.py
index 769589f..54d1439 100644
--- a/ytdlbot/utils.py
+++ b/ytdlbot/utils.py
@@ -188,7 +188,7 @@ class Detector:
     def updates_too_long_detector(self):
         # If you're seeing this, that means you have logged more than 10 device
         # and this earliest account was kicked out. Restart the program could get you back in.
-        indicators = ["types.UpdatesTooLong"]
+        indicators = ["types.UpdatesTooLong", "Got shutdown from remote"]
         for indicator in indicators:
             if indicator in self.logs:
                 logging.warning("Potential crash detected by %s, it's time to commit suicide...", self.func_name())