home
·
contact
·
privacy
projects
/
plomrogue
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
817543d
)
Server/py: Replace HandledException with SystemExit (erlehmann advice).
author
Christian Heller
<c.heller@plomlompom.de>
Thu, 19 Feb 2015 11:11:54 +0000
(12:11 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Thu, 19 Feb 2015 11:11:54 +0000
(12:11 +0100)
plomrogue-server.py
patch
|
blob
|
history
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index 6760c0287752fffef9f27e53d291a91c04e04a92..0b3ce1f85f72f7800527b5b13a05da7218d3f3d4 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-4,12
+4,6
@@
import os
import time
import time
-class HandledException(Exception):
- """Feature-less Exception child. Use for expected operational errors."""
-
- pass
-
-
def setup_server_io(io_db):
"""Fill IO files DB with proper file( path)s. Write process IO test string.
def setup_server_io(io_db):
"""Fill IO files DB with proper file( path)s. Write process IO test string.
@@
-52,7
+46,7
@@
def detect_atomic_leftover(path):
"aborted previous attempt to write '" + path + "'. Aborting until " \
"the matter is resolved by removing it from its current path."
if os.access(path_tmp, os.F_OK):
"aborted previous attempt to write '" + path + "'. Aborting until " \
"the matter is resolved by removing it from its current path."
if os.access(path_tmp, os.F_OK):
- raise
HandledException
(msg)
+ raise
SystemExit
(msg)
def obey(msg):
def obey(msg):
@@
-114,18
+108,16
@@
try:
if opts.replay < 1:
opts.replay = 1
print("Replay mode. Auto-replaying up to turn " + str(opts.replay) +
if opts.replay < 1:
opts.replay = 1
print("Replay mode. Auto-replaying up to turn " + str(opts.replay) +
- " (if so late
a turn is to be found).")
- if not os.access(path_
save
file, os.F_OK):
- raise
HandledException
("No record file found to replay.")
+ " (if so late a turn is to be found).")
+ if not os.access(path_
record
file, os.F_OK):
+ raise
SystemExit
("No record file found to replay.")
elif os.access(path_savefile, os.F_OK):
print(open(path_savefile, "r").read())
else:
msg = "MAKE_WORLD " + str(int(time.time()))
obey(msg)
elif os.access(path_savefile, os.F_OK):
print(open(path_savefile, "r").read())
else:
msg = "MAKE_WORLD " + str(int(time.time()))
obey(msg)
-except SystemExit:
- pass
-except HandledException as exception:
- print("ABORTING: " + exception.args[0])
+except SystemExit as exit:
+ print("ABORTING: " + exit.args[0])
except:
print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
raise
except:
print("SOMETHING WENT WRONG IN UNEXPECTED WAYS")
raise