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

Fixed an issue that didn't allow the runner to launch profiled Portal in interactive mode.

Browse source
This commit is contained in:
Griatch 2012-02-05 17:39:43 +01:00
parent fdceb93dcb
commit 44b5ae07ba
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
game/runner.py
View file

@ -259,11 +259,12 @@ def main():
# don't log to server logfile # don't log to server logfile
del server_argv[2] del server_argv[2]
print _("\nStarting Evennia Server (output to stdout).") print _("\nStarting Evennia Server (output to stdout).")
elif options.sprof:
server_argv.extend(sprof_argv)
print "\nRunning Evennia Server under cProfile."
else: else:
print _("\nStarting Evennia Server (output to server logfile).") print _("\nStarting Evennia Server (output to server logfile).")
if options.sprof:
server_argv.extend(sprof_argv)
print "\nRunning Evennia Server under cProfile."
cycle_logfile(SERVER_LOGFILE) cycle_logfile(SERVER_LOGFILE)
# Portal # Portal
@ -281,12 +282,13 @@ def main():
PORTAL_INTERACTIVE = True PORTAL_INTERACTIVE = True
set_restart_mode(PORTAL_RESTART, True) set_restart_mode(PORTAL_RESTART, True)
print _("\nStarting Evennia Portal in non-Daemon mode (output to stdout).") print _("\nStarting Evennia Portal in non-Daemon mode (output to stdout).")
elif options.pprof:
server_argv.extend(pprof_argv)
print "\nRunning Evennia Portal under cProfile."
else: else:
set_restart_mode(PORTAL_RESTART, False) set_restart_mode(PORTAL_RESTART, False)
print _("\nStarting Evennia Portal in Daemon mode (output to portal logfile).") print _("\nStarting Evennia Portal in Daemon mode (output to portal logfile).")
if options.pprof:
server_argv.extend(pprof_argv)
print "\nRunning Evennia Portal under cProfile."
cycle_logfile(PORTAL_LOGFILE) cycle_logfile(PORTAL_LOGFILE)
# Windows fixes (Windows don't support pidfiles natively) # Windows fixes (Windows don't support pidfiles natively)