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

Removed the addition of site_name and idle_timeout from the server initialization - they are useless since these things are parsed directly from the settings file, also for the web component.

Browse source
This commit is contained in:
Griatch 2016-02-13 17:44:20 +01:00
parent 4ab049709d
commit 49c1254de7
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
evennia/server/initial_setup.py
View file

@ -44,14 +44,6 @@ WARNING_POSTGRESQL_FIX = \
""" """
def create_config_values():
"""
Creates the initial config values.
"""
ServerConfig.objects.conf("site_name", settings.SERVERNAME)
ServerConfig.objects.conf("idle_timeout", settings.IDLE_TIMEOUT)
def get_god_player(): def get_god_player():
""" """
Creates the god user and don't take no for an answer. Creates the god user and don't take no for an answer.
@ -193,8 +185,7 @@ def handle_setup(last_step):
last_step = last_step or 0 last_step = last_step or 0
# setting up the list of functions to run # setting up the list of functions to run
setup_queue = [create_config_values, setup_queue = [create_objects,
create_objects,
create_channels, create_channels,
at_initial_setup, at_initial_setup,
reset_server] reset_server]
@ -208,11 +199,11 @@ def handle_setup(last_step):
try: try:
setup_func() setup_func()
except Exception: except Exception:
if last_step + num == 2: if last_step + num == 1:
from evennia.objects.models import ObjectDB from evennia.objects.models import ObjectDB
for obj in ObjectDB.objects.all(): for obj in ObjectDB.objects.all():
obj.delete() obj.delete()
elif last_step + num == 3: elif last_step + num == 2:
from evennia.comms.models import ChannelDB from evennia.comms.models import ChannelDB
ChannelDB.objects.all().delete() ChannelDB.objects.all().delete()
raise raise