Skip to content

Avoid deprecated UTC timestamp conversion #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Mirochill wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −1
Draft

Avoid deprecated UTC timestamp conversion #115

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion logstash/formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
import socket
import sys
from datetime import datetime
try:
from datetime import timezone
except ImportError:
from datetime import timedelta, tzinfo

class _UTC(tzinfo):
def utcoffset(self, dt):
return timedelta(0)

def tzname(self, dt):
return 'UTC'

def dst(self, dt):
return timedelta(0)

UTC = _UTC()
else:
UTC = timezone.utc

try:
import json
except ImportError:
Expand Down Expand Up @@ -70,7 +89,7 @@ def format_source(cls, message_type, host, path):

@classmethod
def format_timestamp(cls, time):
tstamp = datetime.utcfromtimestamp(time)
tstamp = datetime.fromtimestamp(time, UTC)
return tstamp.strftime("%Y-%m-%dT%H:%M:%S") + ".%03d" % (tstamp.microsecond / 1000) + "Z"

@classmethod
Expand Down