"feat: Update printer templates and database schema"
This commit is contained in:
parent
c7aa7e75b0
commit
4634dd8abe
@ -39,7 +39,7 @@ from utils.logging_config import setup_logging, get_logger, measure_execution_ti
|
|||||||
from utils.job_scheduler import JobScheduler, get_job_scheduler
|
from utils.job_scheduler import JobScheduler, get_job_scheduler
|
||||||
from utils.queue_manager import start_queue_manager, stop_queue_manager, get_queue_manager
|
from utils.queue_manager import start_queue_manager, stop_queue_manager, get_queue_manager
|
||||||
from config.settings import SECRET_KEY, UPLOAD_FOLDER, ALLOWED_EXTENSIONS, ENVIRONMENT, SESSION_LIFETIME, SCHEDULER_ENABLED, SCHEDULER_INTERVAL, TAPO_USERNAME, TAPO_PASSWORD
|
from config.settings import SECRET_KEY, UPLOAD_FOLDER, ALLOWED_EXTENSIONS, ENVIRONMENT, SESSION_LIFETIME, SCHEDULER_ENABLED, SCHEDULER_INTERVAL, TAPO_USERNAME, TAPO_PASSWORD
|
||||||
from utils.file_manager import file_manager, save_job_file, save_guest_file, save_avatar_file, delete_file as delete_file_safe
|
from utils.file_manager import file_manager, save_job_file, save_guest_file, save_avatar_file, save_asset_file, save_log_file, save_backup_file, save_temp_file, delete_file as delete_file_safe
|
||||||
|
|
||||||
# Blueprints importieren
|
# Blueprints importieren
|
||||||
from blueprints.guest import guest_blueprint
|
from blueprints.guest import guest_blueprint
|
||||||
@ -4191,169 +4191,6 @@ def admin_update_printer_form(printer_id):
|
|||||||
flash("Fehler beim Aktualisieren des Druckers.", "error")
|
flash("Fehler beim Aktualisieren des Druckers.", "error")
|
||||||
return redirect(url_for("admin_edit_printer_page", printer_id=printer_id))
|
return redirect(url_for("admin_edit_printer_page", printer_id=printer_id))
|
||||||
|
|
||||||
# ===== STARTUP UND MAIN =====
|
|
||||||
if __name__ == "__main__":
|
|
||||||
import sys
|
|
||||||
import signal
|
|
||||||
import os
|
|
||||||
|
|
||||||
# Debug-Modus prüfen
|
|
||||||
debug_mode = len(sys.argv) > 1 and sys.argv[1] == "--debug"
|
|
||||||
|
|
||||||
# Windows-spezifische Umgebungsvariablen setzen für bessere Flask-Kompatibilität
|
|
||||||
if os.name == 'nt' and debug_mode:
|
|
||||||
# Entferne problematische Werkzeug-Variablen
|
|
||||||
os.environ.pop('WERKZEUG_SERVER_FD', None)
|
|
||||||
os.environ.pop('WERKZEUG_RUN_MAIN', None)
|
|
||||||
|
|
||||||
# Setze saubere Umgebung
|
|
||||||
os.environ['FLASK_ENV'] = 'development'
|
|
||||||
os.environ['PYTHONIOENCODING'] = 'utf-8'
|
|
||||||
os.environ['PYTHONUTF8'] = '1'
|
|
||||||
|
|
||||||
# Windows-spezifisches Signal-Handling für ordnungsgemäßes Shutdown
|
|
||||||
def signal_handler(sig, frame):
|
|
||||||
"""Signal-Handler für ordnungsgemäßes Shutdown."""
|
|
||||||
app_logger.warning(f"🛑 Signal {sig} empfangen - fahre System herunter...")
|
|
||||||
try:
|
|
||||||
# Queue Manager stoppen
|
|
||||||
app_logger.info("🔄 Beende Queue Manager...")
|
|
||||||
stop_queue_manager()
|
|
||||||
|
|
||||||
# Scheduler stoppen falls aktiviert
|
|
||||||
if SCHEDULER_ENABLED and scheduler:
|
|
||||||
try:
|
|
||||||
scheduler.stop()
|
|
||||||
app_logger.info("Job-Scheduler gestoppt")
|
|
||||||
except Exception as e:
|
|
||||||
app_logger.error(f"Fehler beim Stoppen des Schedulers: {str(e)}")
|
|
||||||
|
|
||||||
app_logger.info("✅ Shutdown abgeschlossen")
|
|
||||||
sys.exit(0)
|
|
||||||
except Exception as e:
|
|
||||||
app_logger.error(f"❌ Fehler beim Shutdown: {str(e)}")
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
|
|
||||||
# Signal-Handler registrieren (Windows-kompatibel)
|
|
||||||
if os.name == 'nt': # Windows
|
|
||||||
signal.signal(signal.SIGINT, signal_handler)
|
|
||||||
signal.signal(signal.SIGTERM, signal_handler)
|
|
||||||
# Zusätzlich für Flask-Development-Server
|
|
||||||
signal.signal(signal.SIGBREAK, signal_handler)
|
|
||||||
else: # Unix/Linux
|
|
||||||
signal.signal(signal.SIGINT, signal_handler)
|
|
||||||
signal.signal(signal.SIGTERM, signal_handler)
|
|
||||||
signal.signal(signal.SIGHUP, signal_handler)
|
|
||||||
|
|
||||||
try:
|
|
||||||
# Datenbank initialisieren
|
|
||||||
init_database()
|
|
||||||
create_initial_admin()
|
|
||||||
|
|
||||||
# Template-Hilfsfunktionen registrieren
|
|
||||||
register_template_helpers(app)
|
|
||||||
|
|
||||||
# Drucker-Monitor Steckdosen-Initialisierung beim Start
|
|
||||||
try:
|
|
||||||
app_logger.info("🖨️ Starte automatische Steckdosen-Initialisierung...")
|
|
||||||
initialization_results = printer_monitor.initialize_all_outlets_on_startup()
|
|
||||||
|
|
||||||
if initialization_results:
|
|
||||||
success_count = sum(1 for success in initialization_results.values() if success)
|
|
||||||
total_count = len(initialization_results)
|
|
||||||
app_logger.info(f"✅ Steckdosen-Initialisierung: {success_count}/{total_count} Drucker erfolgreich")
|
|
||||||
|
|
||||||
if success_count < total_count:
|
|
||||||
app_logger.warning(f"⚠️ {total_count - success_count} Drucker konnten nicht initialisiert werden")
|
|
||||||
else:
|
|
||||||
app_logger.info("ℹ️ Keine Drucker zur Initialisierung gefunden")
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
app_logger.error(f"❌ Fehler bei automatischer Steckdosen-Initialisierung: {str(e)}")
|
|
||||||
|
|
||||||
# Queue-Manager für automatische Drucker-Überwachung starten
|
|
||||||
# Nur im Produktionsmodus starten (nicht im Debug-Modus)
|
|
||||||
if not debug_mode:
|
|
||||||
try:
|
|
||||||
queue_manager = start_queue_manager()
|
|
||||||
app_logger.info("✅ Printer Queue Manager erfolgreich gestartet")
|
|
||||||
|
|
||||||
# Verbesserte Shutdown-Handler registrieren
|
|
||||||
def cleanup_queue_manager():
|
|
||||||
try:
|
|
||||||
app_logger.info("🔄 Beende Queue Manager...")
|
|
||||||
stop_queue_manager()
|
|
||||||
except Exception as e:
|
|
||||||
app_logger.error(f"❌ Fehler beim Queue Manager Cleanup: {str(e)}")
|
|
||||||
|
|
||||||
atexit.register(cleanup_queue_manager)
|
|
||||||
|
|
||||||
except Exception as e:
|
|
||||||
app_logger.error(f"❌ Fehler beim Starten des Queue-Managers: {str(e)}")
|
|
||||||
else:
|
|
||||||
app_logger.info("🔄 Debug-Modus: Queue Manager deaktiviert für Entwicklung")
|
|
||||||
|
|
||||||
# Scheduler starten (falls aktiviert)
|
|
||||||
if SCHEDULER_ENABLED:
|
|
||||||
try:
|
|
||||||
scheduler.start()
|
|
||||||
app_logger.info("Job-Scheduler gestartet")
|
|
||||||
except Exception as e:
|
|
||||||
app_logger.error(f"Fehler beim Starten des Schedulers: {str(e)}")
|
|
||||||
|
|
||||||
if debug_mode:
|
|
||||||
# Debug-Modus: HTTP auf Port 5000
|
|
||||||
app_logger.info("Starte Debug-Server auf 0.0.0.0:5000 (HTTP)")
|
|
||||||
|
|
||||||
# Windows-spezifische Flask-Konfiguration
|
|
||||||
run_kwargs = {
|
|
||||||
"host": "0.0.0.0",
|
|
||||||
"port": 5000,
|
|
||||||
"debug": True,
|
|
||||||
"threaded": True
|
|
||||||
}
|
|
||||||
|
|
||||||
if os.name == 'nt':
|
|
||||||
# Windows: Deaktiviere Auto-Reload um WERKZEUG_SERVER_FD Fehler zu vermeiden
|
|
||||||
run_kwargs["use_reloader"] = False
|
|
||||||
run_kwargs["passthrough_errors"] = False
|
|
||||||
app_logger.info("Windows-Debug-Modus: Auto-Reload deaktiviert")
|
|
||||||
|
|
||||||
app.run(**run_kwargs)
|
|
||||||
else:
|
|
||||||
# Produktions-Modus: HTTPS auf Port 443
|
|
||||||
ssl_context = get_ssl_context()
|
|
||||||
|
|
||||||
if ssl_context:
|
|
||||||
app_logger.info("Starte HTTPS-Server auf 0.0.0.0:443")
|
|
||||||
app.run(
|
|
||||||
host="0.0.0.0",
|
|
||||||
port=443,
|
|
||||||
debug=False,
|
|
||||||
ssl_context=ssl_context,
|
|
||||||
threaded=True
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
app_logger.info("Starte HTTP-Server auf 0.0.0.0:8080")
|
|
||||||
app.run(
|
|
||||||
host="0.0.0.0",
|
|
||||||
port=8080,
|
|
||||||
debug=False,
|
|
||||||
threaded=True
|
|
||||||
)
|
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
|
||||||
app_logger.info("🔄 Tastatur-Unterbrechung empfangen - beende Anwendung...")
|
|
||||||
signal_handler(signal.SIGINT, None)
|
|
||||||
except Exception as e:
|
|
||||||
app_logger.error(f"Fehler beim Starten der Anwendung: {str(e)}")
|
|
||||||
# Cleanup bei Fehler
|
|
||||||
try:
|
|
||||||
stop_queue_manager()
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
# ===== FILE-UPLOAD-ROUTEN =====
|
# ===== FILE-UPLOAD-ROUTEN =====
|
||||||
|
|
||||||
@ -4885,4 +4722,167 @@ def cleanup_temp_files():
|
|||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
app_logger.error(f"Fehler beim Aufräumen temporärer Dateien: {str(e)}")
|
app_logger.error(f"Fehler beim Aufräumen temporärer Dateien: {str(e)}")
|
||||||
return jsonify({'error': f'Fehler beim Aufräumen: {str(e)}'}), 500
|
return jsonify({'error': f'Fehler beim Aufräumen: {str(e)}'}), 500
|
||||||
|
|
||||||
|
# ===== STARTUP UND MAIN =====
|
||||||
|
if __name__ == "__main__":
|
||||||
|
import sys
|
||||||
|
import signal
|
||||||
|
import os
|
||||||
|
|
||||||
|
# Debug-Modus prüfen
|
||||||
|
debug_mode = len(sys.argv) > 1 and sys.argv[1] == "--debug"
|
||||||
|
|
||||||
|
# Windows-spezifische Umgebungsvariablen setzen für bessere Flask-Kompatibilität
|
||||||
|
if os.name == 'nt' and debug_mode:
|
||||||
|
# Entferne problematische Werkzeug-Variablen
|
||||||
|
os.environ.pop('WERKZEUG_SERVER_FD', None)
|
||||||
|
os.environ.pop('WERKZEUG_RUN_MAIN', None)
|
||||||
|
|
||||||
|
# Setze saubere Umgebung
|
||||||
|
os.environ['FLASK_ENV'] = 'development'
|
||||||
|
os.environ['PYTHONIOENCODING'] = 'utf-8'
|
||||||
|
os.environ['PYTHONUTF8'] = '1'
|
||||||
|
|
||||||
|
# Windows-spezifisches Signal-Handling für ordnungsgemäßes Shutdown
|
||||||
|
def signal_handler(sig, frame):
|
||||||
|
"""Signal-Handler für ordnungsgemäßes Shutdown."""
|
||||||
|
app_logger.warning(f"🛑 Signal {sig} empfangen - fahre System herunter...")
|
||||||
|
try:
|
||||||
|
# Queue Manager stoppen
|
||||||
|
app_logger.info("🔄 Beende Queue Manager...")
|
||||||
|
stop_queue_manager()
|
||||||
|
|
||||||
|
# Scheduler stoppen falls aktiviert
|
||||||
|
if SCHEDULER_ENABLED and scheduler:
|
||||||
|
try:
|
||||||
|
scheduler.stop()
|
||||||
|
app_logger.info("Job-Scheduler gestoppt")
|
||||||
|
except Exception as e:
|
||||||
|
app_logger.error(f"Fehler beim Stoppen des Schedulers: {str(e)}")
|
||||||
|
|
||||||
|
app_logger.info("✅ Shutdown abgeschlossen")
|
||||||
|
sys.exit(0)
|
||||||
|
except Exception as e:
|
||||||
|
app_logger.error(f"❌ Fehler beim Shutdown: {str(e)}")
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
|
# Signal-Handler registrieren (Windows-kompatibel)
|
||||||
|
if os.name == 'nt': # Windows
|
||||||
|
signal.signal(signal.SIGINT, signal_handler)
|
||||||
|
signal.signal(signal.SIGTERM, signal_handler)
|
||||||
|
# Zusätzlich für Flask-Development-Server
|
||||||
|
signal.signal(signal.SIGBREAK, signal_handler)
|
||||||
|
else: # Unix/Linux
|
||||||
|
signal.signal(signal.SIGINT, signal_handler)
|
||||||
|
signal.signal(signal.SIGTERM, signal_handler)
|
||||||
|
signal.signal(signal.SIGHUP, signal_handler)
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Datenbank initialisieren
|
||||||
|
init_database()
|
||||||
|
create_initial_admin()
|
||||||
|
|
||||||
|
# Template-Hilfsfunktionen registrieren
|
||||||
|
register_template_helpers(app)
|
||||||
|
|
||||||
|
# Drucker-Monitor Steckdosen-Initialisierung beim Start
|
||||||
|
try:
|
||||||
|
app_logger.info("🖨️ Starte automatische Steckdosen-Initialisierung...")
|
||||||
|
initialization_results = printer_monitor.initialize_all_outlets_on_startup()
|
||||||
|
|
||||||
|
if initialization_results:
|
||||||
|
success_count = sum(1 for success in initialization_results.values() if success)
|
||||||
|
total_count = len(initialization_results)
|
||||||
|
app_logger.info(f"✅ Steckdosen-Initialisierung: {success_count}/{total_count} Drucker erfolgreich")
|
||||||
|
|
||||||
|
if success_count < total_count:
|
||||||
|
app_logger.warning(f"⚠️ {total_count - success_count} Drucker konnten nicht initialisiert werden")
|
||||||
|
else:
|
||||||
|
app_logger.info("ℹ️ Keine Drucker zur Initialisierung gefunden")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
app_logger.error(f"❌ Fehler bei automatischer Steckdosen-Initialisierung: {str(e)}")
|
||||||
|
|
||||||
|
# Queue-Manager für automatische Drucker-Überwachung starten
|
||||||
|
# Nur im Produktionsmodus starten (nicht im Debug-Modus)
|
||||||
|
if not debug_mode:
|
||||||
|
try:
|
||||||
|
queue_manager = start_queue_manager()
|
||||||
|
app_logger.info("✅ Printer Queue Manager erfolgreich gestartet")
|
||||||
|
|
||||||
|
# Verbesserte Shutdown-Handler registrieren
|
||||||
|
def cleanup_queue_manager():
|
||||||
|
try:
|
||||||
|
app_logger.info("🔄 Beende Queue Manager...")
|
||||||
|
stop_queue_manager()
|
||||||
|
except Exception as e:
|
||||||
|
app_logger.error(f"❌ Fehler beim Queue Manager Cleanup: {str(e)}")
|
||||||
|
|
||||||
|
atexit.register(cleanup_queue_manager)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
app_logger.error(f"❌ Fehler beim Starten des Queue-Managers: {str(e)}")
|
||||||
|
else:
|
||||||
|
app_logger.info("🔄 Debug-Modus: Queue Manager deaktiviert für Entwicklung")
|
||||||
|
|
||||||
|
# Scheduler starten (falls aktiviert)
|
||||||
|
if SCHEDULER_ENABLED:
|
||||||
|
try:
|
||||||
|
scheduler.start()
|
||||||
|
app_logger.info("Job-Scheduler gestartet")
|
||||||
|
except Exception as e:
|
||||||
|
app_logger.error(f"Fehler beim Starten des Schedulers: {str(e)}")
|
||||||
|
|
||||||
|
if debug_mode:
|
||||||
|
# Debug-Modus: HTTP auf Port 5000
|
||||||
|
app_logger.info("Starte Debug-Server auf 0.0.0.0:5000 (HTTP)")
|
||||||
|
|
||||||
|
# Windows-spezifische Flask-Konfiguration
|
||||||
|
run_kwargs = {
|
||||||
|
"host": "0.0.0.0",
|
||||||
|
"port": 5000,
|
||||||
|
"debug": True,
|
||||||
|
"threaded": True
|
||||||
|
}
|
||||||
|
|
||||||
|
if os.name == 'nt':
|
||||||
|
# Windows: Deaktiviere Auto-Reload um WERKZEUG_SERVER_FD Fehler zu vermeiden
|
||||||
|
run_kwargs["use_reloader"] = False
|
||||||
|
run_kwargs["passthrough_errors"] = False
|
||||||
|
app_logger.info("Windows-Debug-Modus: Auto-Reload deaktiviert")
|
||||||
|
|
||||||
|
app.run(**run_kwargs)
|
||||||
|
else:
|
||||||
|
# Produktions-Modus: HTTPS auf Port 443
|
||||||
|
ssl_context = get_ssl_context()
|
||||||
|
|
||||||
|
if ssl_context:
|
||||||
|
app_logger.info("Starte HTTPS-Server auf 0.0.0.0:443")
|
||||||
|
app.run(
|
||||||
|
host="0.0.0.0",
|
||||||
|
port=443,
|
||||||
|
debug=False,
|
||||||
|
ssl_context=ssl_context,
|
||||||
|
threaded=True
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
app_logger.info("Starte HTTP-Server auf 0.0.0.0:8080")
|
||||||
|
app.run(
|
||||||
|
host="0.0.0.0",
|
||||||
|
port=8080,
|
||||||
|
debug=False,
|
||||||
|
threaded=True
|
||||||
|
)
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
app_logger.info("🔄 Tastatur-Unterbrechung empfangen - beende Anwendung...")
|
||||||
|
signal_handler(signal.SIGINT, None)
|
||||||
|
except Exception as e:
|
||||||
|
app_logger.error(f"Fehler beim Starten der Anwendung: {str(e)}")
|
||||||
|
# Cleanup bei Fehler
|
||||||
|
try:
|
||||||
|
stop_queue_manager()
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
sys.exit(1)
|
||||||
Binary file not shown.
@ -517,7 +517,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="mt-4 pt-4 border-t border-green-200 dark:border-green-800">
|
<div class="mt-4 pt-4 border-t border-green-200 dark:border-green-800">
|
||||||
<div class="text-xs text-mercedes-gray dark:text-slate-400">
|
<div class="text-xs text-mercedes-gray dark:text-slate-400">
|
||||||
<span class="font-medium" id="online-percentage">0%</span> % aller Drucker
|
<span class="font-medium" id="online-percentage">0%</span> aller Drucker
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user