Commit c2ecd08e authored by Sanad Liaquat's avatar Sanad Liaquat

Merge branch 'acunskis-fix-verbose-log' into 'master'

E2E: Reduce log verbosity of every api request

See merge request gitlab-org/gitlab!71795
parents 2a59fe2c 6bd2e7bb
...@@ -81,7 +81,7 @@ module QA ...@@ -81,7 +81,7 @@ module QA
def with_retry_on_too_many_requests def with_retry_on_too_many_requests
response = nil response = nil
Support::Retrier.retry_until do Support::Retrier.retry_until(log: false) do
response = yield response = yield
if response.code == HTTP_STATUS_TOO_MANY_REQUESTS if response.code == HTTP_STATUS_TOO_MANY_REQUESTS
......
...@@ -34,15 +34,29 @@ module QA ...@@ -34,15 +34,29 @@ module QA
result result
end end
def retry_until(max_attempts: nil, max_duration: nil, reload_page: nil, sleep_interval: 0, raise_on_failure: true, retry_on_exception: false, log: true) def retry_until(
max_attempts: nil,
max_duration: nil,
reload_page: nil,
sleep_interval: 0,
raise_on_failure: true,
retry_on_exception: false,
log: true
)
# For backwards-compatibility # For backwards-compatibility
max_attempts = 3 if max_attempts.nil? && max_duration.nil? max_attempts = 3 if max_attempts.nil? && max_duration.nil?
if log if log
start_msg ||= ["with retry_until:"] start_msg = ["with retry_until:"]
start_msg << "max_attempts: #{max_attempts};" if max_attempts start_msg << "max_attempts: #{max_attempts};" if max_attempts
start_msg << "max_duration: #{max_duration};" if max_duration start_msg << "max_duration: #{max_duration};" if max_duration
start_msg << "reload_page: #{reload_page}; sleep_interval: #{sleep_interval}; raise_on_failure: #{raise_on_failure}; retry_on_exception: #{retry_on_exception}" start_msg.push(*[
"reload_page: #{reload_page};",
"sleep_interval: #{sleep_interval};",
"raise_on_failure: #{raise_on_failure};",
"retry_on_exception: #{retry_on_exception}"
])
QA::Runtime::Logger.debug(start_msg.join(' ')) QA::Runtime::Logger.debug(start_msg.join(' '))
end end
...@@ -58,7 +72,7 @@ module QA ...@@ -58,7 +72,7 @@ module QA
) do ) do
result = yield result = yield
end end
QA::Runtime::Logger.debug("ended retry_until") QA::Runtime::Logger.debug("ended retry_until") if log
result result
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment