lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Network insight, python2/3 compatibility for get_timeseries.py

Browse Source
This commit is contained in:
Ad Schellevis 2018-11-29 15:57:20 +01:00
parent 3cb1443b47
commit 508e892880
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/opnsense/scripts/netflow/lib/aggregate.py
View File

@ -35,16 +35,16 @@ import sqlite3
def convert_timestamp(val):
""" convert timestamps from string (internal sqlite type) or seconds since epoch
"""
if val.find('-') > -1:
if val.find(b'-') > -1:
# formatted date/time
if val.find(" ") > -1:
datepart, timepart = val.split(" ")
if val.find(b" ") > -1:
datepart, timepart = val.split(b" ")
else:
datepart = val
timepart = "0:0:0,0"
year, month, day = list(map(int, datepart.split("-")))
timepart_full = timepart.split(".")
hours, minutes, seconds = list(map(int, timepart_full[0].split(":")))
year, month, day = list(map(int, datepart.split(b"-")))
timepart_full = timepart.split(b".")
hours, minutes, seconds = list(map(int, timepart_full[0].split(b":")))
if len(timepart_full) == 2:
microseconds = int('{:0<6.6}'.format(timepart_full[1].decode()))
else: