From f98340bff664b8a8fef173edb58063d66caead26 Mon Sep 17 00:00:00 2001 From: Shane Date: Thu, 15 May 2025 20:02:19 +1000 Subject: [PATCH] fix running instead of sleep for X --- foodie_automator_google.py | 6 ++++-- foodie_automator_reddit.py | 4 +++- foodie_automator_rss.py | 6 ++++-- manage_scripts.sh | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/foodie_automator_google.py b/foodie_automator_google.py index 9ddb4c1..91161ec 100644 --- a/foodie_automator_google.py +++ b/foodie_automator_google.py @@ -505,8 +505,10 @@ def run_google_trends_automator(): if not post_data: logging.info("No postable Google Trend found") logging.info("Completed Google Trends run") - update_system_activity(SCRIPT_NAME, "stopped") # Record stop logging.info(f"Run completed, sleep_time: {sleep_time} seconds") + # Sleep while still marked as running + time.sleep(sleep_time) + update_system_activity(SCRIPT_NAME, "stopped") # Record stop after sleep return post_data, category, sleep_time except Exception as e: logging.error(f"Fatal error in run_google_trends_automator: {e}", exc_info=True) @@ -523,4 +525,4 @@ def run_google_trends_automator(): if __name__ == "__main__": setup_logging() post_data, category, sleep_time = run_google_trends_automator() - logging.info(f"Run completed, sleep_time: {sleep_time} seconds") \ No newline at end of file + # logging.info(f"Run completed, sleep_time: {sleep_time} seconds") \ No newline at end of file diff --git a/foodie_automator_reddit.py b/foodie_automator_reddit.py index 9d0aed4..8e1988d 100644 --- a/foodie_automator_reddit.py +++ b/foodie_automator_reddit.py @@ -544,8 +544,10 @@ def run_reddit_automator(): if not post_data: logging.info("No postable Reddit article found") logging.info("Completed Reddit run") - update_system_activity(SCRIPT_NAME, "stopped") # Record stop logging.info(f"Run completed, sleep_time: {sleep_time} seconds") + # Sleep while still marked as running + time.sleep(sleep_time) + update_system_activity(SCRIPT_NAME, "stopped") # Record stop after sleep return post_data, category, sleep_time except Exception as e: logging.error(f"Fatal error in run_reddit_automator: {e}", exc_info=True) diff --git a/foodie_automator_rss.py b/foodie_automator_rss.py index 0893281..f38365d 100644 --- a/foodie_automator_rss.py +++ b/foodie_automator_rss.py @@ -458,8 +458,10 @@ def run_rss_automator(): if not post_data: logging.info("No postable RSS article found") logging.info("Completed RSS run") - update_system_activity(SCRIPT_NAME, "stopped") # Record stop logging.info(f"Run completed, sleep_time: {sleep_time} seconds") + # Sleep while still marked as running + time.sleep(sleep_time) + update_system_activity(SCRIPT_NAME, "stopped") # Record stop after sleep return post_data, category, sleep_time except Exception as e: logging.error(f"Fatal error in run_rss_automator: {e}", exc_info=True) @@ -475,4 +477,4 @@ def run_rss_automator(): if __name__ == "__main__": post_data, category, sleep_time = run_rss_automator() - logging.info(f"Run completed, sleep_time: {sleep_time} seconds") \ No newline at end of file + # logging.info(f"Run completed, sleep_time: {sleep_time} seconds") \ No newline at end of file diff --git a/manage_scripts.sh b/manage_scripts.sh index 0310311..3b32814 100755 --- a/manage_scripts.sh +++ b/manage_scripts.sh @@ -93,8 +93,8 @@ stop_scripts() { import json, os f = '/home/shane/foodie_automator/system_activity.json' if os.path.exists(f): - with open(f) as fh: - data = json.load(f) + with open(f, 'r') as fh: + data = json.load(fh) changed = False for entry in data: if entry.get('status') == 'running':