monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent crash when running MultiServer.py if host.yaml is not present (#46)

This commit is contained in:
Chris Wilson 2020-03-07 23:43:15 -05:00 committed by GitHub
parent 99e7d51f11
commit 74c7eca301
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MultiServer.py
View File

@ -6,6 +6,7 @@ import logging
import zlib import zlib
import collections import collections
import typing import typing
import os
import ModuleUpdate import ModuleUpdate
ModuleUpdate.update() ModuleUpdate.update()
@ -613,10 +614,12 @@ async def main():
parser.add_argument('--disable_item_cheat', default=False, action='store_true') parser.add_argument('--disable_item_cheat', default=False, action='store_true')
parser.add_argument('--disable_port_forward', default=False, action='store_true') parser.add_argument('--disable_port_forward', default=False, action='store_true')
args = parser.parse_args() args = parser.parse_args()
file_options = Utils.parse_yaml(open("host.yaml").read())["server_options"]
for key, value in file_options.items(): if os.path.exists('host.yaml'):
if value is not None: file_options = Utils.parse_yaml(open("host.yaml").read())["server_options"]
setattr(args, key, value) for key, value in file_options.items():
if value is not None:
setattr(args, key, value)
logging.basicConfig(format='[%(asctime)s] %(message)s', level=getattr(logging, args.loglevel.upper(), logging.INFO)) logging.basicConfig(format='[%(asctime)s] %(message)s', level=getattr(logging, args.loglevel.upper(), logging.INFO))
if not args.disable_port_forward: if not args.disable_port_forward:
try: try: