From 6671611f0d5416d2b4f6f54aa40a44034865376a Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 10 Jan 2019 01:56:20 +0100
Subject: [PATCH] Don't abort initial save file replay on error.
---
server.py | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/server.py b/server.py
index 7e2d80d..f6dcd35 100755
--- a/server.py
+++ b/server.py
@@ -106,8 +106,7 @@ class CommandHandler(game_common.Commander, server_.game.Commander):
self.pool = Pool()
self.pool_result = None
- def handle_input(self, input_, connection_id=None, abort_on_error=False,
- store=True):
+ def handle_input(self, input_, connection_id=None, store=True):
"""Process input_ to command grammar, call command handler if found."""
from inspect import signature
try:
@@ -124,12 +123,8 @@ class CommandHandler(game_common.Commander, server_.game.Commander):
f.write(input_ + '\n')
except parser.ArgError as e:
self.send_to(connection_id, 'ARGUMENT ERROR: ' + str(e))
- if abort_on_error:
- exit(1)
except server_.game.GameError as e:
self.send_to(connection_id, 'GAME ERROR: ' + str(e))
- if abort_on_error:
- exit(1)
def send_to(self, connection_id, msg):
"""Send msg to client of connection_id; if no later, print instead."""
@@ -264,7 +259,7 @@ if os.path.exists(game_file_name):
for i in range(len(lines)):
line = lines[i]
print("FILE INPUT LINE %s: %s" % (i, line), end='')
- commander.handle_input(line, abort_on_error=True, store=False)
+ commander.handle_input(line, store=False)
else:
commander.handle_input('MAP_SIZE Y:5,X:5')
commander.handle_input('TERRAIN_LINE 0 "xxxxx"')
--
2.30.2