Skip to content

Allow specifying relative times in seconds #284

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

Open
csw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow specifying relative times in seconds #284

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions awslogs/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,13 +275,13 @@ def parse_datetime(self, datetime_text):
if not datetime_text:
return None

ago_regexp = r'(\d+)\s?(m|minute|minutes|h|hour|hours|d|day|days|w|weeks|weeks)(?: ago)?'
ago_regexp = r'(\d+)\s?(s|sec|second|m|minute|minutes|h|hour|hours|d|day|days|w|weeks|weeks)(?: ago)?'
ago_match = re.match(ago_regexp, datetime_text)

if ago_match:
amount, unit = ago_match.groups()
amount = int(amount)
unit = {'m': 60, 'h': 3600, 'd': 86400, 'w': 604800}[unit[0]]
unit = {'s': 1, 'm': 60, 'h': 3600, 'd': 86400, 'w': 604800}[unit[0]]
date = datetime.utcnow() + timedelta(seconds=unit * amount * -1)
else:
try:
Expand Down
11 changes: 10 additions & 1 deletion tests/test_it.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,16 @@ def iso2epoch(iso_str):

self.assertEqual(awslogs.parse_datetime(''), None)
self.assertEqual(awslogs.parse_datetime(None), None)
plan = (('2015-01-01 02:59:00', '1m'),
plan = (('2015-01-01 02:59:59', '1s'),
('2015-01-01 02:59:59', '1s ago'),
('2015-01-01 02:59:59', '1sec'),
('2015-01-01 02:59:59', '1sec ago'),
('2015-01-01 02:59:59', '1second'),
('2015-01-01 02:59:59', '1second ago'),
('2015-01-01 02:59:59', '1seconds'),
('2015-01-01 02:59:59', '1seconds ago'),

('2015-01-01 02:59:00', '1m'),
('2015-01-01 02:59:00', '1m ago'),
('2015-01-01 02:59:00', '1minute'),
('2015-01-01 02:59:00', '1minute ago'),
Expand Down