diff --git a/discordbot/__init__.py b/discordbot/__init__.py index 335cd9c..ff5d9ad 100644 --- a/discordbot/__init__.py +++ b/discordbot/__init__.py @@ -11,8 +11,8 @@ from database.models import Configuration, GameBundle, Humeur class DiscordBot(discord.Client): async def on_ready(self): logging.info(f'Logged in as {self.user} (ID: {self.user.id})') - # for c in self.get_all_channels() : - # print(f'{c.id} {c.name}') + for c in self.get_all_channels() : + logging.info(f'{c.id} {c.name}') self.loop.create_task(self.updateStatus()) self.loop.create_task(self.updateHumbleBundle()) diff --git a/run-web.py b/run-web.py index 19be727..009268e 100644 --- a/run-web.py +++ b/run-web.py @@ -1,7 +1,7 @@ import locale import logging -import multiprocessing +import threading from webapp import webapp from discordbot import bot @@ -20,13 +20,10 @@ if __name__ == '__main__': locale.setlocale(locale.LC_TIME, 'fr_FR.UTF-8') jobs = [] - jobs.append(multiprocessing.Process(target=start_discord_bot)) - jobs.append(multiprocessing.Process(target=start_server)) + jobs.append(threading.Thread(target=start_discord_bot)) + jobs.append(threading.Thread(target=start_server)) for job in jobs: job.start() - - print(bot.get_all_channels()) - for job in jobs: job.join() diff --git a/webapp/__init__.py b/webapp/__init__.py index 6f5f7c4..d011c17 100644 --- a/webapp/__init__.py +++ b/webapp/__init__.py @@ -1,5 +1,4 @@ from flask import Flask -from discordbot import bot webapp = Flask(__name__) diff --git a/webapp/configurations.py b/webapp/configurations.py index faa461d..110f5cf 100644 --- a/webapp/configurations.py +++ b/webapp/configurations.py @@ -8,7 +8,6 @@ from discordbot import bot def openConfigurations(): all = Configuration.query.all() configurations = {conf.key: conf for conf in all} - return render_template("configurations.html", configurations = configurations, channels = bot.get_all_channels()) @webapp.route("/updateConfiguration", methods=['POST'])