Working on bugs with getting system to go through initialization sanely.

This commit is contained in:
Griatch 2015-01-08 16:54:50 +01:00
parent 33a42d06c5
commit f15e05c247
3 changed files with 1 additions and 8 deletions

View File

@ -878,8 +878,6 @@ def main():
run_menu()
elif mode in ('start', 'reload', 'stop'):
# operate the server directly
if mode != "stop":
check_database(False)
server_operation(mode, service, args.interactive, args.profiler)
else:
# pass-through to django manager

View File

@ -135,7 +135,6 @@ def _cache_lockfuncs():
global _LOCKFUNCS
_LOCKFUNCS = {}
for modulepath in settings.LOCK_FUNC_MODULES:
modulepath = utils.pypath_to_realpath(modulepath)
mod = utils.mod_import(modulepath)
if mod:
for tup in (tup for tup in inspect.getmembers(mod) if callable(tup[1])):

View File

@ -74,8 +74,8 @@ def create_objects():
god_character.db.desc = _('This is User #1.')
god_character.locks.add("examine:perm(Immortals);edit:false();delete:false();boot:false();msg:all();puppet:false()")
god_character.permissions.add("Immortals")
god_character.save()
god_player.attributes.add("_first_login", True)
god_player.attributes.add("_last_puppet", god_character)
god_player.db._playable_characters.append(god_character)
@ -248,13 +248,9 @@ def handle_setup(last_step):
setup_func()
except Exception:
if last_step + num == 2:
from evennia.players.models import PlayerDB
from evennia.objects.models import ObjectDB
for obj in ObjectDB.objects.all():
obj.delete()
for profile in PlayerDB.objects.all():
profile.delete()
elif last_step + num == 3:
from evennia.comms.models import ChannelDB
ChannelDB.objects.all().delete()