Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1705 from Packetdancer/master

Browse source 
Add an "--initmissing" switch to the Evennia launcher
This commit is contained in:
Griatch 2018-10-26 20:47:30 +02:00 • committed by GitHub
commit 21119cbc9b
1 changed files with 36 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

37
evennia/server/evennia_launcher.py
View file

@ -222,6 +222,19 @@ RECREATED_SETTINGS = \
their accounts with their old passwords. their accounts with their old passwords.
""" """
ERROR_INITMISSING = \
"""
ERROR: 'evennia --initmissing' must be called from the root of
your game directory, since it tries to create any missing files
in the server/ subfolder.
"""
RECREATED_MISSING = \
"""
(Re)created any missing directories or files. Evennia should
be ready to run now!
"""
ERROR_DATABASE = \ ERROR_DATABASE = \
""" """
ERROR: Your database does not seem to be set up correctly. ERROR: Your database does not seem to be set up correctly.
@ -1331,7 +1344,10 @@ def create_settings_file(init=True, secret_settings=False):
else: else:
print("Reset the settings file.") print("Reset the settings file.")
default_settings_path = os.path.join(EVENNIA_TEMPLATE, "server", "conf", "settings.py") if secret_settings:
default_settings_path = os.path.join(EVENNIA_TEMPLATE, "server", "conf", "secret_settings.py")
else:
default_settings_path = os.path.join(EVENNIA_TEMPLATE, "server", "conf", "settings.py")
shutil.copy(default_settings_path, settings_path) shutil.copy(default_settings_path, settings_path)
with open(settings_path, 'r') as f: with open(settings_path, 'r') as f:
@ -1914,6 +1930,10 @@ def main():
'--initsettings', action='store_true', dest="initsettings", '--initsettings', action='store_true', dest="initsettings",
default=False, default=False,
help="create a new, empty settings file as\n gamedir/server/conf/settings.py") help="create a new, empty settings file as\n gamedir/server/conf/settings.py")
parser.add_argument(
'--initmissing', action='store_true', dest="initmissing",
default=False,
help="checks for missing secret_settings or server logs\n directory, and adds them if needed")
parser.add_argument( parser.add_argument(
'--profiler', action='store_true', dest='profiler', default=False, '--profiler', action='store_true', dest='profiler', default=False,
help="start given server component under the Python profiler") help="start given server component under the Python profiler")
@ -1987,6 +2007,21 @@ def main():
print(ERROR_INITSETTINGS) print(ERROR_INITSETTINGS)
sys.exit() sys.exit()
if args.initmissing:
try:
log_path = os.path.join(SERVERDIR, "logs")
if not os.path.exists(log_path):
os.makedirs(log_path)
settings_path = os.path.join(CONFDIR, "secret_settings.py")
if not os.path.exists(settings_path):
create_settings_file(init=False, secret_settings=True)
print(RECREATED_MISSING)
except IOError:
print(ERROR_INITMISSING)
sys.exit()
if args.tail_log: if args.tail_log:
# set up for tailing the log files # set up for tailing the log files
global NO_REACTOR_STOP global NO_REACTOR_STOP