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:
ad68927
)
Server/py: Improve atomicity of record(), description of its strategy.
author
Christian Heller
<c.heller@plomlompom.de>
Sun, 22 Feb 2015 10:50:03 +0000
(11:50 +0100)
committer
Christian Heller
<c.heller@plomlompom.de>
Sun, 22 Feb 2015 10:50:03 +0000
(11:50 +0100)
plomrogue-server.py
patch
|
blob
|
history
diff --git
a/plomrogue-server.py
b/plomrogue-server.py
index 47390a4dffdb14056a7975404810688c485b64b6..c9cc20e78bb4d560a34fc180e6da488c8adeeb3c 100755
(executable)
--- a/
plomrogue-server.py
+++ b/
plomrogue-server.py
@@
-78,8
+78,10
@@
def obey(cmd, io_db, prefix):
def record(cmd, io_db):
def record(cmd, io_db):
- """Append cmd string plus newline to file at path_recordfile."""
- # Doesn't yet replace old record() fully.
+ """Append cmd string plus newline to file at path_recordfile. (Atomic.)"""
+ # This misses some optimizations from the original record(), namely only
+ # finishing the atomic write with flush() and fsync() every 15 seconds
+ # unless explicitely forced. Implement as needed.
path_tmp = io_db["path_record"] + io_db["tmp_suffix"]
if os.access(io_db["path_record"], os.F_OK):
shutil.copyfile(io_db["path_record"], path_tmp)
path_tmp = io_db["path_record"] + io_db["tmp_suffix"]
if os.access(io_db["path_record"], os.F_OK):
shutil.copyfile(io_db["path_record"], path_tmp)
@@
-88,6
+90,8
@@
def record(cmd, io_db):
file.flush()
os.fsync(file.fileno())
file.close()
file.flush()
os.fsync(file.fileno())
file.close()
+ if os.access(io_db["path_record"], os.F_OK):
+ os.remove(io_db["path_record"])
os.rename(path_tmp, io_db["path_record"])
os.rename(path_tmp, io_db["path_record"])