Update app.py

app.py

@@ -3,58 +3,70 @@ from apscheduler.schedulers.background import BackgroundScheduler
 import subprocess
 import threading
 import pytz
+import logging
 from datetime import datetime
 
+# Initialize Flask app
 app = Flask(__name__)
+
+# Setup logging
+logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(levelname)s - %(message)s")
+
+# Execution logs
 execution_logs = []
-MAX_LOG_ENTRIES = 20
+MAX_LOG_ENTRIES = 50
+log_lock = threading.Lock()  # Prevents race conditions when modifying logs
 
-def run_cli_script():
-    """Runs cli.py and streams logs in real-time to both UI and terminal."""
 
-    # Get the current UTC time and convert to IST
+def add_log_entry(entry):
+    """Safely add log entries while maintaining MAX_LOG_ENTRIES limit."""
+    with log_lock:
+        execution_logs.append(entry)
+        if len(execution_logs) > MAX_LOG_ENTRIES:
+            execution_logs.pop(0)
+
+
+def get_ist_time():
+    """Get the current time in IST (Indian Standard Time)."""
     utc_now = datetime.utcnow()
     ist_timezone = pytz.timezone("Asia/Kolkata")
-    ist_time = utc_now.replace(tzinfo=pytz.utc).astimezone(ist_timezone)
-    
-    # Format the IST time
-    timestamp = ist_time.strftime("%Y-%m-%d %H:%M:%S IST")
-    
-   # timestamp = datetime.utcnow().strftime("%Y-%m-%d %H:%M:%S UTC")
-    log_entry = {'time': timestamp, 'output': '', 'error': ''}
+    return utc_now.replace(tzinfo=pytz.utc).astimezone(ist_timezone)
+
+
+def run_cli_script():
+    """Runs cli.py and streams logs in real-time to both UI and terminal."""
+    timestamp = get_ist_time().strftime("%Y-%m-%d %H:%M:%S IST")
 
     try:
         process = subprocess.Popen(
             ["python", "cli.py"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            text=True,
-            bufsize=1
+            text=True
         )
 
-        # Stream logs to UI and print to terminal
-        for line in process.stdout:
-            log_entry['output'] += line
-            execution_logs.append({'time': timestamp, 'output': line, 'error': ''})
-            print(line, end="")  # ✅ Print logs to terminal
-            if len(execution_logs) > MAX_LOG_ENTRIES:
-                execution_logs.pop(0)
-
-        for line in process.stderr:
-            log_entry['error'] += line
-            execution_logs.append({'time': timestamp, 'output': '', 'error': line})
-            print(line, end="")  # ✅ Print errors to terminal
-            if len(execution_logs) > MAX_LOG_ENTRIES:
-                execution_logs.pop(0)
+        stdout, stderr = process.communicate()  # Wait for process to complete
+
+        if stdout:
+            add_log_entry({'time': timestamp, 'output': stdout, 'error': ''})
+            logging.info(stdout.strip())
+
+        if stderr:
+            add_log_entry({'time': timestamp, 'output': '', 'error': stderr})
+            logging.error(stderr.strip())
 
     except Exception as e:
-        log_entry['error'] = str(e)
-        execution_logs.append({'time': timestamp, 'output': '', 'error': str(e)})
-        print(f"Error: {str(e)}")  # ✅ Print error to terminal
+        error_msg = str(e)
+        add_log_entry({'time': timestamp, 'output': '', 'error': error_msg})
+        logging.error(f"Error: {error_msg}")
+
 
 def start_initial_run():
+    """Runs the CLI script immediately upon startup in a separate thread."""
     threading.Thread(target=run_cli_script, daemon=True).start()
 
+
+# Initialize scheduler
 scheduler = BackgroundScheduler(daemon=True)
 scheduler.add_job(
     run_cli_script,
@@ -65,17 +77,15 @@ scheduler.add_job(
 )
 scheduler.start()
 
+# Ensure script runs once on startup
 start_initial_run()
 
+
 @app.route('/')
 def home():
     """Main UI displaying logs and next run time."""
     job = scheduler.get_job('main_job')
-    if job:
-        ist_time = job.next_run_time.astimezone(pytz.timezone("Asia/Kolkata"))
-        next_run = ist_time.strftime('%Y-%m-%d %H:%M:%S IST')
-    else:
-        next_run = 'N/A'
+    next_run = get_ist_time().strftime('%Y-%m-%d %H:%M:%S IST') if job else 'N/A'
 
     return render_template_string('''
         <!DOCTYPE html>
@@ -129,24 +139,30 @@ def home():
         </html>
     ''', next_run=next_run)
 
+
 @app.route('/logs')
 def logs():
     """Returns logs as JSON for AJAX polling."""
     return jsonify({'logs': execution_logs})
 
+
 @app.route('/force-run')
 def force_run():
     """Manually trigger the script execution."""
     threading.Thread(target=run_cli_script, daemon=True).start()
+    logging.info("Manual script execution triggered")
     return "Script executed manually", 200
 
+
 @app.route('/run-check')
 def run_check():
-    """Check if the scheduler is still running."""
+    """Check if the scheduler is still running and restart if necessary."""
     if not scheduler.running:
-        print("Scheduler was stopped! Restarting...")
+        logging.warning("Scheduler was stopped! Restarting...")
         scheduler.start()
+        return "Scheduler restarted", 200
     return "Scheduler is running", 200
 
+
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=7860)