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

Merge pull request #28 from jjohnson42/jsonrollevent

Browse Source 
Change rollover event to be JSON
This commit is contained in:
Jarrod Johnson 2015-09-30 10:19:34 -04:00
commit d9ed98d58e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
confluent_server/confluent/log.py
View File

@ -551,7 +551,7 @@ class Logger(object):
# which cause the rolling event.
to_bfile, to_tfile = files
self.logentries.appendleft(entry)
roll_data = "rename:%s>%s" % (self.handler.textpath, to_tfile)
roll_data = json.dumps({'previouslogfile': to_tfile})
self.logentries.appendleft([DataTypes.event, tstamp, roll_data,
Events.logrollover, None])
self._lock(fcntl.LOCK_UN)
@ -563,7 +563,7 @@ class Logger(object):
def parse_last_rolling_files(textfile, offset, datalen):
textfile.seek(offset, 0)
textpath = textfile.read(datalen).split('>')[1]
textpath = json.loads(textfile.read(datalen))['previouslogfile']
dir_name, base_name = os.path.split(textpath)
temp = base_name.split('.')
temp.insert(1,'cbl')