From 36d6d1135b59548dee1aa23c70e148ab9fda0818 Mon Sep 17 00:00:00 2001 From: Lulzette Date: Thu, 23 Sep 2021 04:11:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=BE=D0=BB=D1=8C=D1=88=D0=B5=20PEP8+?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=B5=D1=89?= =?UTF-8?q?=D0=B5=20=D1=87=D1=83=D1=87=D1=83=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- daemon.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/daemon.py b/daemon.py index af91320..45a693c 100755 --- a/daemon.py +++ b/daemon.py @@ -16,7 +16,6 @@ import logging from logging.handlers import TimedRotatingFileHandler streamers = config_python.streamers client_id = config_python.twitchid -ytdl_options = config_python.ytdl_options log_format = logging.Formatter('%(asctime)s %(levelname)s:%(message)s') log_file = 'output.log' @@ -65,7 +64,7 @@ def recorder(i): cmdline = ["youtube-dl", "-q", "-o", path+"/%(upload_date)s_%(title)s__%(timestamp)s_%(id)s.%(ext)s", "https://twitch.tv/" + i] - s = subprocess.call(cmdline) + subprocess.call(cmdline) log.info("Запись стрима %s закончена\n" % i) if (os.path.exists(path+"/pid")): os.system("rm "+path+"/pid") @@ -115,22 +114,26 @@ def removeOldStreams(): # Получаем список файлов # и смотрим, превышает ли кол-во mp4 файлов заданное в конфиге # Если превышает - удаляем старейший - oldest = min(os.listdir(records_path+"/"+i), key=os.path.getctime) + oldest = min(os.listdir(records_path+"/"+i), + key=os.path.getctime) os.unlink(oldest) log.warning("Удален файл: " + oldest) except Exception as e: log.error(e) + def get_console_handler(): console_handler = logging.StreamHandler(sys.stdout) console_handler.setFormatter(log_format) return console_handler + def get_file_handler(): file_handler = TimedRotatingFileHandler(log_file, when='midnight') file_handler.setFormatter(log_format) return file_handler + def get_logger(logger_name): logger = logging.getLogger(logger_name) logger.setLevel(logging.DEBUG) @@ -142,7 +145,8 @@ def get_logger(logger_name): if __name__ == "__main__": # Проверить, установлены ли нужные утилиты - if not checkTools(): exit() + if not checkTools(): + exit() # Log config log = get_logger("main")