xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 11:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix order of text log reassembly

Browse Source 
The facility was incorrectly reassembling the text records in reverse order.  With this change,
the set buffer from log function seems to be working as intended.
This commit is contained in:
Jarrod Johnson 2014-03-12 19:50:42 -04:00
parent 92210a9097
commit 2742e83751
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
confluent/log.py
View File

@ -154,7 +154,7 @@ class Logger(object):
binfile.seek(0, 2)
binidx = binfile.tell() - 16
currsize = 0
offsets = collections.deque()
offsets = []
termstate = None
while binidx > 0 and currsize < size:
binfile.seek(binidx, 0)
@ -169,13 +169,13 @@ class Logger(object):
currsize += datalen
offsets.append((offset, datalen))
if termstate is None:
termstate = termstate | eventaux
termstate = eventaux
fcntl.flock(binfile, fcntl.LOCK_UN)
binfile.close()
textdata = ''
fcntl.flock(textfile, fcntl.LOCK_SH)
while offsets:
(offset, len) = offsets.popleft()
(offset, len) = offsets.pop()
textfile.seek(offset, 0)
textdata += textfile.read(len)
fcntl.flock(textfile, fcntl.LOCK_UN)