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 (from parent 1:
76180c9
)
Server/py: Improve handling of parallel server instances conflict.
author
Christian Heller
<c.heller@plomlompom.de>
Sun, 22 Feb 2015 12:11:14 +0000
(13:11 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sun, 22 Feb 2015 12:11:14 +0000
(13:11 +0100)
plomrogue-server.py
patch
|
blob
|
history
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index df0c211bdd2458ffad559f636404abd4f90285ae..a921e93558fe3cd7993aa4757bc8dc4d3a36193a 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-39,11
+39,12
@@
def setup_server_io(io_db):
def cleanup_server_io(io_db):
def cleanup_server_io(io_db):
- """Close and
remove all files open in IO files DB
."""
+ """Close and
(if io_db["kicked_by_rival"] false) remove files in io_db
."""
def helper(file_key, path_key):
if file_key in io_db:
io_db[file_key].close()
def helper(file_key, path_key):
if file_key in io_db:
io_db[file_key].close()
- os.remove(io_db[path_key])
+ if not io_db["kicked_by_rival"]:
+ os.remove(io_db[path_key])
helper("file_out", "path_out")
helper("file_in", "path_in")
helper("file_worldstate", "path_worldstate")
helper("file_out", "path_out")
helper("file_in", "path_in")
helper("file_worldstate", "path_worldstate")
@@
-131,19
+132,23
@@
def parse_command_line_arguments():
def server_test(io_db):
def server_test(io_db):
- """Check for valid server out file belonging to current process."""
+ """Ensure valid server out file belonging to current process.
+
+ On failure, set io_db["kicked_by_rival"] and raise SystemExit.
+ """
if not os.access(io_db["path_out"], os.F_OK):
raise SystemExit("Server output file has disappeared.")
file = open(io_db["path_out"], "r")
test = file.readline().rstrip("\n")
file.close()
if not os.access(io_db["path_out"], os.F_OK):
raise SystemExit("Server output file has disappeared.")
file = open(io_db["path_out"], "r")
test = file.readline().rstrip("\n")
file.close()
- print(str(test) + " == " + io_db["teststring"] + " ?")
if test != io_db["teststring"]:
if test != io_db["teststring"]:
+ io_db["kicked_by_rival"] = True
msg = "Server test string in server output file does not match. This" \
" indicates that the current server process has been " \
"superseded by another one."
raise SystemExit(msg)
msg = "Server test string in server output file does not match. This" \
" indicates that the current server process has been " \
"superseded by another one."
raise SystemExit(msg)
+
io_db = {}
world_db = {}
try:
io_db = {}
world_db = {}
try:
@@
-170,6
+175,8
@@
try:
raise SystemExit(msg)
obey_lines_in_file(io_db["path_worldconf"], "world config ")
obey("MAKE_WORLD " + str(int(time.time())), io_db, "in file")
raise SystemExit(msg)
obey_lines_in_file(io_db["path_worldconf"], "world config ")
obey("MAKE_WORLD " + str(int(time.time())), io_db, "in file")
+ while 1:
+ server_test(io_db)
# print("DUMMY: Run io_loop().")
except SystemExit as exit:
print("ABORTING: " + exit.args[0])
# print("DUMMY: Run io_loop().")
except SystemExit as exit:
print("ABORTING: " + exit.args[0])