Update app.py

app.py

@@ -1,6 +1,7 @@
 from flask import Flask, render_template_string
 from apscheduler.schedulers.background import BackgroundScheduler
 import subprocess
+import threading
 from datetime import datetime
 
 app = Flask(__name__)
@@ -8,6 +9,7 @@ execution_logs = []
 MAX_LOG_ENTRIES = 20
 
 def run_cli_script():
+    """Executes cli.py and stores logs."""
     timestamp = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
     log_entry = {'time': timestamp, 'output': '', 'error': ''}
     
@@ -18,8 +20,8 @@ def run_cli_script():
             text=True,
             timeout=300
         )
-        log_entry['output'] = result.stdout
-        log_entry['error'] = result.stderr
+        log_entry['output'] = result.stdout.strip()
+        log_entry['error'] = result.stderr.strip()
     except Exception as e:
         log_entry['error'] = str(e)
     finally:
@@ -27,21 +29,27 @@ def run_cli_script():
         if len(execution_logs) > MAX_LOG_ENTRIES:
             execution_logs.pop(0)
 
-# Initialize scheduler with a named job
+# Start script in a separate thread to avoid blocking Flask
+def start_initial_run():
+    threading.Thread(target=run_cli_script, daemon=True).start()
+
+# Initialize scheduler
 scheduler = BackgroundScheduler(daemon=True)
 scheduler.add_job(
     run_cli_script,
     'interval',
     hours=3,
     id='main_job',
-    next_run_time=datetime.now()  # Initial run time
+    next_run_time=datetime.now()
 )
 scheduler.start()
-run_cli_script()  # Initial run
+
+# Run the script asynchronously to prevent blocking
+start_initial_run()
 
 @app.route('/')
 def home():
-    # Get the specific job by ID
+    """Main UI displaying logs and next run time."""
     job = scheduler.get_job('main_job')
     next_run = job.next_run_time.strftime('%Y-%m-%d %H:%M:%S UTC') if job else 'N/A'
     
@@ -60,6 +68,8 @@ def home():
                     border-radius: 5px; 
                     margin-top: 20px;
                     white-space: pre-wrap;
+                    max-height: 400px;
+                    overflow-y: auto;
                 }
                 .timestamp { color: #888; margin-bottom: 10px; }
                 .error { color: #ff4444; }
@@ -84,14 +94,24 @@ def home():
                 {% endfor %}
             </div>
             <p><a href="/force-run">Trigger Manual Run</a></p>
+            <p><a href="/run-check">Check Scheduler Status</a></p>
         </body>
         </html>
     ''', next_run=next_run, logs=execution_logs)
 
 @app.route('/force-run')
 def force_run():
-    run_cli_script()
+    """Manually trigger the script execution."""
+    threading.Thread(target=run_cli_script, daemon=True).start()
     return "Script executed manually", 200
 
+@app.route('/run-check')
+def run_check():
+    """Check if the scheduler is still running."""
+    if not scheduler.running:
+        print("Scheduler was stopped! Restarting...")
+        scheduler.start()
+    return "Scheduler is running", 200
+
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=7860)
+    app.run(host='0.0.0.0', port=7860)