PapaTutuWawa/xmpp-discord-bridge
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

main: Accept the config file from the cli

Browse Source
This commit is contained in:
PapaTutuWawa 2021-11-25 22:31:03 +01:00
parent 40fcd404a4
commit 8ab23c63ab
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xmpp_discord_bridge/main.py
View File

@ -489,21 +489,26 @@ class BridgeComponent(ComponentXMPP):
asyncio.ensure_future(self._discord.start(self._token)) asyncio.ensure_future(self._discord.start(self._token))
def main(): def main():
if os.path.exists("./config.toml"): parser = OptionParser()
parser.add_option(
"-d", "--debug", dest="debug", help="Enable debug logging", action="store_true"
)
parser.add_option(
"-c", "--config", dest="config", help="Config file path"
)
(options, args) = parser.parse_args()
verbosity = logging.DEBUG if options.debug else logging.INFO
if options.config:
config = toml.load(options.config)
elif os.path.exists("./config.toml"):
config = toml.load("./config.toml") config = toml.load("./config.toml")
elif os.path.exists("/etc/discord-xmpp-bridge/config.toml"): elif os.path.exists("/etc/discord-xmpp-bridge/config.toml"):
config = toml.load("/etc/discord-xmpp-bridge/config.toml") config = toml.load("/etc/discord-xmpp-bridge/config.toml")
else: else:
raise Exception("config.toml not found") raise Exception("config.toml not found")
parser = OptionParser()
parser.add_option(
"-d", "--debug", dest="debug", help="Enable debug logging", action="store_true"
)
(options, args) = parser.parse_args()
verbosity = logging.DEBUG if options.debug else logging.INFO
general = config["general"] general = config["general"]
xmpp = BridgeComponent(general["jid"], xmpp = BridgeComponent(general["jid"],
general["secret"], general["secret"],