Enlever SIGTERM et avec SIGINT trop violent, attente corrections shionn

This commit is contained in:
skylanix
2025-08-16 19:55:25 +02:00
parent 6ccb308b17
commit 07f677312c

View File

@@ -1,48 +1,25 @@
import locale import locale
import logging import logging
import os
import signal
import sys
import threading import threading
from webapp import webapp from webapp import webapp
from discordbot import bot from discordbot import bot
def start_server(): def start_server():
logging.info("Start Web Serveur") logging.info("Start Web Serveur")
from waitress import serve from waitress import serve
serve(webapp, host="0.0.0.0", port=5000) serve(webapp, host="0.0.0.0", port=5001)
def start_discord_bot(): def start_discord_bot():
logging.info("Start Discord Bot") logging.info("Start Discord Bot")
with webapp.app_context(): with webapp.app_context():
bot.begin() bot.begin()
def signal_handler(sig, frame):
logging.info("Arrêt immédiat...")
os._exit(0)
if __name__ == '__main__': if __name__ == '__main__':
locale.setlocale(locale.LC_TIME, 'fr_FR.UTF-8') locale.setlocale(locale.LC_TIME, 'fr_CH.UTF-8')
signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
jobs = []
discord_thread = threading.Thread(target=start_discord_bot)
server_thread = threading.Thread(target=start_server)
discord_thread.daemon = True
server_thread.daemon = True
jobs.append(discord_thread)
jobs.append(server_thread)
try:
for job in jobs: job.start()
for job in jobs: job.join()
except KeyboardInterrupt:
logging.info("Arrêt immédiat demandé")
os._exit(0)
jobs = []
jobs.append(threading.Thread(target=start_discord_bot))
jobs.append(threading.Thread(target=start_server))
for job in jobs: job.start()
for job in jobs: job.join()