Skip to content
This repository was archived by the owner on Jul 19, 2023. It is now read-only.

Commit 63118f7

Browse files
committed
Revert "Add stepback on finding log groups and procesing groups"
This reverts commit 1256571.
1 parent 1256571 commit 63118f7

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

lib/logstash/inputs/cloudwatch_logs.rb

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -131,18 +131,9 @@ def find_log_groups
131131
@logger.debug("log_group prefix is enabled, searching for log groups")
132132
groups = []
133133
next_token = nil
134-
stepback = 1
135134
@log_group.each do |group|
136135
loop do
137-
begin
138-
log_groups = @cloudwatch.describe_log_groups(log_group_name_prefix: group, next_token: next_token)
139-
rescue Aws::CloudWatchLogs::Errors::ThrottlingException
140-
@logger.debug("CloudWatch Logs (find_log_groups) stepping back ", :stepback => 2 * stepback * 60)
141-
sleep(2 ** stepback * 60)
142-
stepback += 1
143-
@logger.debug("CloudWatch Logs (find_log_groups) beginning again with token ", :token => next_token)
144-
next
145-
end
136+
log_groups = @cloudwatch.describe_log_groups(log_group_name_prefix: group, next_token: next_token)
146137
groups += log_groups.log_groups.map {|n| n.log_group_name}
147138
next_token = log_groups.next_token
148139
@logger.debug("found #{log_groups.log_groups.length} log groups matching prefix #{group}")
@@ -177,7 +168,6 @@ def determine_start_position(groups)
177168
private
178169
def process_group(group)
179170
next_token = nil
180-
stepback = 1
181171
loop do
182172
if !@sincedb.member?(group)
183173
@sincedb[group] = 0
@@ -188,15 +178,7 @@ def process_group(group)
188178
:interleaved => true,
189179
:next_token => next_token
190180
}
191-
begin
192-
resp = @cloudwatch.filter_log_events(params)
193-
rescue Aws::CloudWatchLogs::Errors::ThrottlingException
194-
@logger.debug("CloudWatch Logs (process_group) stepping back ", :stepback => 2 * stepback * 60)
195-
sleep(2 ** stepback * 60)
196-
stepback += 1
197-
@logger.debug("CloudWatch Logs (process_group) beginning again with token ", :token => next_token, :log_group_name => group)
198-
next
199-
end
181+
resp = @cloudwatch.filter_log_events(params)
200182

201183
resp.events.each do |event|
202184
process_log(event, group)

0 commit comments

Comments
 (0)