liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored config file loading

Browse Source
This commit is contained in:
Ske
2019-03-08 17:22:05 +01:00
parent abda846ca3
commit 560b79c2ae
2 changed files with 41 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/bot_main.py
View File

@@ -1,6 +1,4 @@
import asyncio
import json
import os
import sys
try:
@@ -10,13 +8,5 @@ try:
except ImportError:
pass
with open(sys.argv[1] if len(sys.argv) > 1 else "pluralkit.conf") as f:
config = json.load(f)
if "database_uri" not in config and "DATABASE_URI" not in os.environ:
print("Config file must contain key 'database_uri', or the environment variable DATABASE_URI must be present.")
elif "token" not in config and "TOKEN" not in os.environ:
print("Config file must contain key 'token', or the environment variable TOKEN must be present.")
else:
from pluralkit import bot
bot.run(os.environ.get("TOKEN", config.get("token")), os.environ.get("DATABASE_URI", config.get("database_uri")), int(config.get("log_channel", 0)))
from pluralkit import bot
bot.run(bot.Config.from_file_and_env(sys.argv[1] if len(sys.argv) > 1 else "pluralkit.conf"))