Skip to content

Commit d40d73c

Browse files
Use the non-deprecated datetime.fromtimestamp method and fix some small linting errors (#21)
Co-authored-by: Petr Heinz <[email protected]>
1 parent b291afa commit d40d73c

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

logtail/frame.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# coding: utf-8
22
from __future__ import print_function, unicode_literals
3-
from datetime import datetime
3+
from datetime import datetime, timezone
44

55
from os import path
66
import __main__
@@ -11,10 +11,8 @@ def create_frame(record, message, context, include_extra_attributes=False):
1111
if "request" in r and not isinstance(r["request"], (dict, list, bool, int, float, str)) :
1212
del r["request"]
1313
frame = {}
14-
# Python 3 only solution if we ever drop Python 2.7
15-
# frame['dt'] = datetime.utcfromtimestamp(r['created']).replace(tzinfo=timezone.utc).isoformat()
16-
frame['dt'] = "{}+00:00".format(datetime.utcfromtimestamp(r['created']).isoformat())
17-
frame['level'] = level = _levelname(r['levelname'])
14+
frame['dt'] = datetime.fromtimestamp(r['created'], timezone.utc).isoformat()
15+
frame['level'] = _levelname(r['levelname'])
1816
frame['severity'] = int(r['levelno'] / 10)
1917
frame['message'] = message
2018
frame['context'] = ctx = {}
@@ -47,7 +45,7 @@ def _parse_custom_events(record, include_extra_attributes):
4745
default_keys = {
4846
'args', 'asctime', 'created', 'exc_info', 'exc_text', 'pathname',
4947
'funcName', 'levelname', 'levelno', 'lineno', 'module', 'msecs',
50-
'message', 'msg', 'name', 'pathname', 'process', 'processName',
48+
'message', 'msg', 'name', 'process', 'processName',
5149
'relativeCreated', 'thread', 'threadName'
5250
}
5351
events = {}

logtail/handler.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ def emit(self, record):
6868
# Only raised when not blocking, which means that extra events
6969
# should be dropped.
7070
self.dropcount += 1
71-
pass
7271
except Exception as e:
7372
if self.raise_exceptions:
7473
raise e

tests/test_flusher.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ def _setup_worker(self, uploader=None):
2525
return pipe, uploader, fw
2626

2727
def test_is_thread(self):
28-
pipe, uploader, fw = self._setup_worker()
28+
_, _, fw = self._setup_worker()
2929
self.assertIsInstance(fw, threading.Thread)
3030

3131
def test_flushes_when_queue_is_full(self):
3232
first_frame = list(range(self.buffer_capacity))
33-
second_frame = list(range(self.buffer_capacity, self.buffer_capacity * 2))
3433
self.calls = 0
3534
self.flush_interval = 1000
3635

0 commit comments

Comments
 (0)