From 1c298951d60b5b7a0cc62129bbb0e5fdf7c06352 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 7 Mar 2015 20:27:12 +0100 Subject: [PATCH] Fixed an error in Windows version that put pid files in the wrong location (how come a Windows user didn't notice this one before?) --- evennia/server/portal/portal.py | 12 +++++------- evennia/server/server.py | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py index c9b9b088ac..c61e7036b3 100644 --- a/evennia/server/portal/portal.py +++ b/evennia/server/portal/portal.py @@ -131,10 +131,9 @@ class Portal(object): """ if mode is None: return - f = open(PORTAL_RESTART, 'w') - print "writing mode=%(mode)s to %(portal_restart)s" % {'mode': mode, 'portal_restart': PORTAL_RESTART} - f.write(str(mode)) - f.close() + with open(PORTAL_RESTART, 'w') as f: + print "writing mode=%(mode)s to %(portal_restart)s" % {'mode': mode, 'portal_restart': PORTAL_RESTART} + f.write(str(mode)) def shutdown(self, restart=None, _reactor_stopping=False): """ @@ -330,6 +329,5 @@ print '-' * 50 # end of terminal output if os.name == 'nt': # Windows only: Set PID file manually - f = open(os.path.join(settings.GAME_DIR, 'portal.pid'), 'w') - f.write(str(os.getpid())) - f.close() + with open(PORTAL_PIDFILE, 'w') as f: + f.write(str(os.getpid())) diff --git a/evennia/server/server.py b/evennia/server/server.py index 777bbbf9a3..6b8955a0c4 100644 --- a/evennia/server/server.py +++ b/evennia/server/server.py @@ -535,6 +535,6 @@ ServerConfig.objects.conf("server_starting_mode", delete=True) if os.name == 'nt': # Windows only: Set PID file manually - with open(os.path.join(settings.GAME_DIR, 'server.pid'), 'w') as f: + with open(SERVER_PIDFILE, 'w') as f: f.write(str(os.getpid()))