Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

HH-29729 bad merge fixed

  • Loading branch information...
commit 74236618bdcda2cba2d19b5b9ea562461fb18923 1 parent a5ed2a0
@katraev katraev authored
Showing with 4 additions and 4 deletions.
  1. +4 −4 frontik/frontik_logging.py
View
8 frontik/frontik_logging.py
@@ -42,7 +42,7 @@ def __get_logfile_name(self):
class BulkGELFHandler(GELFHandler):
- def handler_bulk(self, records_list, stages= None, status_code=None, exception=None, **kw):
+ def handle_bulk(self, records_list, stages= None, status_code=None, exception=None, **kw):
if records_list != []:
first_record = records_list[0]
@@ -61,8 +61,8 @@ def handler_bulk(self, records_list, stages= None, status_code=None, exception=N
record_for_gelf.exc_info=traceback.format_exc(record.exc_info)
record_for_gelf.message +=" {0} {1} {2} \n".format(record.asctime, record.levelname,record.message)
if stages is not None:
- for stage_name,stage_time in stages:
- setattr(record_for_gelf,stage_name,str(int(stage_time)))
+ for stage_name, stage_start, stage_delta in stages:
+ setattr(record_for_gelf,stage_name,str(stage_delta - stage_start))
record_for_gelf.code = status_code
GELFHandler.handle(self, record_for_gelf)
@@ -125,7 +125,7 @@ def get_records_list(self):
def flush(self, **kw):
for handler in self.bulk_handlers:
- handler.handler_bulk(self.records_list, **kw)
+ handler.handle_bulk(self.records_list, **kw)
self.handler_ref = weakref.ref(handler)
self.handler_started = self.handler_ref().handler_started

0 comments on commit 7423661

Please sign in to comment.
Something went wrong with that request. Please try again.