From 45f43353f5db7dc72b2785f0ffe2445b888f4b4e Mon Sep 17 00:00:00 2001 From: Pablo Yaniz Date: Fri, 23 Dec 2022 11:33:28 -0600 Subject: [PATCH] Reviewed functionality and implemented quality of code changes --- rffmpeg | 9 ++++----- rffmpeg.yml.sample | 9 +++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/rffmpeg b/rffmpeg index bf1f2b5..5010282 100755 --- a/rffmpeg +++ b/rffmpeg @@ -109,11 +109,10 @@ def load_config(): # Parse the keys from the logging group config["log_to_file"] = config_logging.get("log_to_file", True) config["logfile"] = config_logging.get("logfile", "/var/log/jellyfin/rffmpeg.log") - config["logfiledated"] = config_logging.get("logfiledated", False) - if config["logfiledated"] is True: - config["logfile"] = config_logging.get("logfile", "/var/log/jellyfin/"+ (datetime.today()).strftime('%Y%m%d') +"_rffmpeg.log") - else: - config["logfile"] = config_logging.get("logfile", "/var/log/jellyfin/rffmpeg.log") + config["datedlogfiles"] = config_logging.get("datedlogfiles", False) + if config["datedlogfiles"] is True: + config["datedlogdir"] = config_logging.get("datedlogdir", "/var/log/jellyfin") + config["logfile"] = f"{config['datedlogdir']}/{datetime.today().strftime('%Y%m%d')}_rffmpeg.log" config["logdebug"] = config_logging.get("debug", False) # Parse the keys from the state group diff --git a/rffmpeg.yml.sample b/rffmpeg.yml.sample index 21aaf8b..840c048 100644 --- a/rffmpeg.yml.sample +++ b/rffmpeg.yml.sample @@ -16,9 +16,14 @@ rffmpeg: # Ensure the user running rffmpeg can write to this directory. #logfile: "/var/log/jellyfin/rffmpeg.log" - # You can add the date to the logfile if you prefer to have one file per day. - #logfiledated: false + # Use a Jellyfin-logging compatible dated log format, e.g. "20221223_rffmpeg.log" + # Supersedes the "logfile" directive above + #datedlogfiles: false + # Use this base directory for Jellyfin-logging compatible dated log files if you enable "datedlogfiles" + # Set this to your Jellyfin logging directory if it differs from the default + #datedlogdir: /var/log/jellyfin + # Show debugging messages #debug: false