logos-storage/logtools
1
0
Fork 0
mirror of https://github.com/logos-storage/logtools.git synced 2026-01-02 13:33:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix time offset parsing to allow negative offsets

Browse Source
This commit is contained in:
gmega 2024-02-06 10:29:10 -03:00
parent 4e88571216
commit 77240e2b7d
No known key found for this signature in database
GPG Key ID: FFD8DAF00660270F
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
logtools/log/sources/parse/chronicles_raw_source.py
View File

@ -10,7 +10,7 @@ from dateutil import parser
from logtools.log.base import LogSource, TLocation, RawLogLine, TimestampedLogLine from logtools.log.base import LogSource, TLocation, RawLogLine, TimestampedLogLine
_LOG_LINE = re.compile( _LOG_LINE = re.compile(
r'(?P<line_type>\w{3}) (?P<timestamp>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}\+\d{2}:\d{2}) (?P<message>.*) ' r'(?P<line_type>\w{3}) (?P<timestamp>\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}[+-]\d{2}:\d{2}) (?P<message>.*) '
r'count=(?P<count>\d+)$' r'count=(?P<count>\d+)$'
) )

64
logtools/log/sources/parse/tests/test_chronicles_raw_source.py
View File

@ -7,15 +7,15 @@ from logtools.log.sources.input.string_log_source import StringLogSource
from logtools.log.sources.parse.chronicles_raw_source import ChroniclesRawSource, ChroniclesLogLine, LogLevel from logtools.log.sources.parse.chronicles_raw_source import ChroniclesRawSource, ChroniclesLogLine, LogLevel
def test_should_parse_raw_chronicles_logs(): def parse_single_line(lines: str):
source = ChroniclesRawSource( return next(ChroniclesRawSource(StringLogSource(lines)).__iter__())
StringLogSource(
lines='TRC 2023-10-16 17:28:46.579+00:00 Sending want list to peer '
'topics="codex blockexcnetwork" tid=1 peer=16U*7mogoM type=WantBlock items=1 count=870781'
)
).__iter__()
line = next(source)
def test_should_parse_raw_chronicles_logs():
line = parse_single_line(
'TRC 2023-10-16 17:28:46.579+00:00 Sending want list to peer '
'topics="codex blockexcnetwork" tid=1 peer=16U*7mogoM type=WantBlock items=1 count=870781'
)
assert line.level == LogLevel.trace assert line.level == LogLevel.trace
assert line.timestamp == datetime(2023, 10, 16, 17, 28, 46, assert line.timestamp == datetime(2023, 10, 16, 17, 28, 46,
@ -53,14 +53,10 @@ def test_should_parse_chronicles_fields():
def test_should_parse_topics_with_non_alphanumeric_character_values(): def test_should_parse_topics_with_non_alphanumeric_character_values():
source = ChroniclesRawSource( line = parse_single_line(
StringLogSource( 'WRN 2024-02-02 20:38:47.316+00:00 a message topics="codex pendingblocks" address="cid: zDx*QP4zx9" '
lines='WRN 2024-02-02 20:38:47.316+00:00 a message topics="codex pendingblocks" address="cid: zDx*QP4zx9" ' 'count=10641'
'count=10641' )
)
).__iter__()
line = next(source)
assert line.message == "a message" assert line.message == "a message"
assert line.count == 10641 assert line.count == 10641
@ -71,14 +67,10 @@ def test_should_parse_topics_with_non_alphanumeric_character_values():
def test_should_parse_topics_with_escaped_quotes_in_values(): def test_should_parse_topics_with_escaped_quotes_in_values():
source = ChroniclesRawSource( line = parse_single_line(
StringLogSource( 'WRN 2024-02-02 20:38:47.316+00:00 a message topics="codex pendingblocks" '
lines='WRN 2024-02-02 20:38:47.316+00:00 a message topics="codex pendingblocks" ' 'address="cid: \\"zDx*QP4zx9\\"" count=10641'
'address="cid: \\"zDx*QP4zx9\\"" count=10641' )
)
).__iter__()
line = next(source)
assert line.message == "a message" assert line.message == "a message"
assert line.count == 10641 assert line.count == 10641
@ -89,14 +81,10 @@ def test_should_parse_topics_with_escaped_quotes_in_values():
def test_should_parse_topics_with_escaped_quotes_and_backlashes_in_value(): def test_should_parse_topics_with_escaped_quotes_and_backlashes_in_value():
source = ChroniclesRawSource( line = parse_single_line(
StringLogSource( 'TRC 2024-02-02 20:37:18.316+00:00 Starting codex node topics="codex node" '
lines='TRC 2024-02-02 20:37:18.316+00:00 Starting codex node topics="codex node" ' 'config="some \\"quoted\\" string with \'more\' escape chars" count=7'
'config="some \\"quoted\\" string with \'more\' escape chars" count=7' )
)
).__iter__()
line = next(source)
assert line.message == "Starting codex node" assert line.message == "Starting codex node"
assert line.count == 7 assert line.count == 7
@ -104,3 +92,15 @@ def test_should_parse_topics_with_escaped_quotes_and_backlashes_in_value():
'topics': '"codex node"', 'topics': '"codex node"',
'config': '"some \\"quoted\\" string with \'more\' escape chars"', 'config': '"some \\"quoted\\" string with \'more\' escape chars"',
} }
def test_should_parse_timestamps_with_negative_time_offsets():
line = parse_single_line(
'WRN 2024-02-02 20:38:47.316-03:00 a message topics="codex pendingblocks" address="cid: zDx*QP4zx9" '
'count=10641'
)
assert line.timestamp == datetime(2024, 2, 2, 20, 38, 47, 316000,
tzinfo=pytz.FixedOffset(-180))
assert line.message == "a message"
assert line.count == 10641

2
pyproject.toml
View File

@ -1,6 +1,6 @@
[tool.poetry] [tool.poetry]
name = "logtools" name = "logtools"
version = "1.1.3" version = "1.1.4"
description = "" description = ""
authors = ["gmega <giuliano@status.im>"] authors = ["gmega <giuliano@status.im>"]
readme = "README.md" readme = "README.md"