Skip to content

Commit

Permalink
fixup! generator: watch: use max startTime from events
Browse files Browse the repository at this point in the history
  • Loading branch information
blueyed committed May 28, 2018
1 parent 5473c2f commit ad69d4a
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions awslogs/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,9 @@ def generator():

while True:
response = self.client.filter_log_events(**kwargs)
events = response.get('events', [])

for event in response.get('events', []):
if (self.watch and
event['timestamp'] > kwargs.get('startTime', 0)):
kwargs['startTime'] = event['timestamp']

for event in events:
if event['eventId'] not in interleaving_sanity:
interleaving_sanity.append(event['eventId'])
yield event
Expand All @@ -139,6 +136,13 @@ def generator():
time.sleep(1)
if 'nextToken' in kwargs:
del kwargs['nextToken']

if events:
kwargs['startTime'] = max(
event['timestamp'] for event in events
)
assert kwargs['startTime'] == events[-1]['timestamp']

else:
raise StopIteration

Expand Down

0 comments on commit ad69d4a

Please sign in to comment.