lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

log: parse timestamps %Y/%m/%d %H:%M:%S for https://github.com/opnsense/core/issues/3831

Browse Source
This commit is contained in:
Ad Schellevis 2019-11-28 18:00:49 +01:00
parent 2ccb852673
commit eed35c92b7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/opnsense/scripts/systemhealth/queryLog.py
View File

@ -40,6 +40,7 @@ sys.path.insert(0, "/usr/local/opnsense/site-python")
from log_helper import reverse_log_reader, fetch_clog
import argparse
squid_ext_timeformat = r'.*(\[\d{1,2}/[A-Za-z]{3}/\d{4}:\d{1,2}:\d{1,2}:\d{1,2} \+\d{4}\]).*'
squid_timeformat = r'^(\d{4}/\d{1,2}/\d{1,2} \d{1,2}:\d{1,2}:\d{1,2}).*'
if __name__ == '__main__':
# handle parameters
@ -111,6 +112,12 @@ if __name__ == '__main__':
record['timestamp'] = ts.isoformat()
# strip timestamp
record['line'] = record['line'].replace(grp, '')
elif re.match(squid_timeformat, record['line']):
tmp = re.match(squid_timeformat, record['line'])
grp = tmp.group(1)
ts = datetime.datetime.strptime(grp, "%Y/%m/%d %H:%M:%S")
record['timestamp'] = ts.isoformat()
record['line'] = record['line'][19:].strip()
result['rows'].append(record)
elif result['total_rows'] > offset + limit:
# do not fetch data until end of file...