xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-01-11 02:22:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into multiplex

Browse Source
This commit is contained in:
Jarrod Johnson
2016-03-25 16:47:23 -04:00
parent d753ac2833 2dd6c31513
commit 44a5c2b464
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
confluent_server/confluent/log.py
View File

@@ -625,6 +625,8 @@ class Logger(object):
binfile = open(binpath, mode='r')
textfile = open(textpath, mode='r')
except IOError:
binfile = None
textfile = None
break
flock(binfile, LOCK_SH)
flock(textfile, LOCK_SH)
@@ -649,11 +651,15 @@ class Logger(object):
textdata = ''
while offsets:
(offset, length, textpath) = offsets.pop()
if textfile is None:
textfile = open(textpath, mode='r')
flock(textfile, LOCK_SH)
if textfile.name != textpath:
try:
flock(textfile, LOCK_UN)
textfile.close()
textfile = open(textpath, mode='r')
flock(textfile, LOCK_SH)
except (ValueError, IOError) as e:
break
try: