From 1b68f71348ecf3983b76b40d7940da8377f049b7 Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Mon, 29 Apr 2024 07:43:28 +0300 Subject: #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed --- indra/newview/llhttpretrypolicy.cpp | 158 ++++++++++++++++++------------------ 1 file changed, 79 insertions(+), 79 deletions(-) (limited to 'indra/newview/llhttpretrypolicy.cpp') diff --git a/indra/newview/llhttpretrypolicy.cpp b/indra/newview/llhttpretrypolicy.cpp index 6a2daeeb90..44d33eec93 100644 --- a/indra/newview/llhttpretrypolicy.cpp +++ b/indra/newview/llhttpretrypolicy.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llhttpretrypolicy.h * @brief Header for a retry policy class intended for use with http responders. * * $LicenseInfo:firstyear=2013&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2013, Linden Research, Inc. - * + * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; * version 2.1 of the License only. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * + * * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -43,116 +43,116 @@ namespace } LLAdaptiveRetryPolicy::LLAdaptiveRetryPolicy(F32 min_delay, F32 max_delay, F32 backoff_factor, U32 max_retries, bool retry_on_4xx): - mMinDelay(min_delay), - mMaxDelay(max_delay), - mBackoffFactor(backoff_factor), - mMaxRetries(max_retries), - mRetryOn4xx(retry_on_4xx) + mMinDelay(min_delay), + mMaxDelay(max_delay), + mBackoffFactor(backoff_factor), + mMaxRetries(max_retries), + mRetryOn4xx(retry_on_4xx) { - init(); + init(); } void LLAdaptiveRetryPolicy::init() { - mDelay = mMinDelay; - mRetryCount = 0; - mShouldRetry = true; + mDelay = mMinDelay; + mRetryCount = 0; + mShouldRetry = true; } void LLAdaptiveRetryPolicy::reset() { - init(); + init(); } bool LLAdaptiveRetryPolicy::getRetryAfter(const LLSD& headers, F32& retry_header_time) { - return (headers.has(HTTP_IN_HEADER_RETRY_AFTER) - && getSecondsUntilRetryAfter(headers[HTTP_IN_HEADER_RETRY_AFTER].asStringRef(), retry_header_time)); + return (headers.has(HTTP_IN_HEADER_RETRY_AFTER) + && getSecondsUntilRetryAfter(headers[HTTP_IN_HEADER_RETRY_AFTER].asStringRef(), retry_header_time)); } bool LLAdaptiveRetryPolicy::getRetryAfter(const LLCore::HttpHeaders::ptr_t &headers, F32& retry_header_time) { - if (headers) - { - const std::string *retry_value = headers->find(HTTP_IN_HEADER_RETRY_AFTER.c_str()); - if (retry_value && - getSecondsUntilRetryAfter(*retry_value, retry_header_time)) - { - return true; - } - } - return false; + if (headers) + { + const std::string *retry_value = headers->find(HTTP_IN_HEADER_RETRY_AFTER.c_str()); + if (retry_value && + getSecondsUntilRetryAfter(*retry_value, retry_header_time)) + { + return true; + } + } + return false; } void LLAdaptiveRetryPolicy::onSuccess() { - init(); + init(); } void LLAdaptiveRetryPolicy::onFailure(S32 status, const LLSD& headers) { - F32 retry_header_time; - bool has_retry_header_time = getRetryAfter(headers,retry_header_time); - onFailureCommon(status, has_retry_header_time, retry_header_time); + F32 retry_header_time; + bool has_retry_header_time = getRetryAfter(headers,retry_header_time); + onFailureCommon(status, has_retry_header_time, retry_header_time); } - + void LLAdaptiveRetryPolicy::onFailure(const LLCore::HttpResponse *response) { - F32 retry_header_time; - const LLCore::HttpHeaders::ptr_t headers = response->getHeaders(); - bool has_retry_header_time = getRetryAfter(headers,retry_header_time); - onFailureCommon(response->getStatus().getType(), has_retry_header_time, retry_header_time); + F32 retry_header_time; + const LLCore::HttpHeaders::ptr_t headers = response->getHeaders(); + bool has_retry_header_time = getRetryAfter(headers,retry_header_time); + onFailureCommon(response->getStatus().getType(), has_retry_header_time, retry_header_time); } void LLAdaptiveRetryPolicy::onFailureCommon(S32 status, bool has_retry_header_time, F32 retry_header_time) { - if (!mShouldRetry) - { - LL_INFOS() << "keep on failing" << LL_ENDL; - return; - } - if (mRetryCount > 0) - { - mDelay = llclamp(mDelay*mBackoffFactor,mMinDelay,mMaxDelay); - } - // Honor server Retry-After header. - // Status 503 may ask us to wait for a certain amount of time before retrying. - F32 wait_time = mDelay; - if (has_retry_header_time) - { - wait_time = retry_header_time; - } - - if (mRetryCount>=mMaxRetries) - { - LL_INFOS() << "Too many retries " << mRetryCount << ", will not retry" << LL_ENDL; - mShouldRetry = false; - } - if (!mRetryOn4xx && !isHttpServerErrorStatus(status)) - { - LL_INFOS() << "Non-server error " << status << ", will not retry" << LL_ENDL; - mShouldRetry = false; - } - if (mShouldRetry) - { - LL_INFOS() << "Retry count " << mRetryCount << " should retry after " << wait_time << LL_ENDL; - mRetryTimer.reset(); - mRetryTimer.setTimerExpirySec(wait_time); - } - mRetryCount++; + if (!mShouldRetry) + { + LL_INFOS() << "keep on failing" << LL_ENDL; + return; + } + if (mRetryCount > 0) + { + mDelay = llclamp(mDelay*mBackoffFactor,mMinDelay,mMaxDelay); + } + // Honor server Retry-After header. + // Status 503 may ask us to wait for a certain amount of time before retrying. + F32 wait_time = mDelay; + if (has_retry_header_time) + { + wait_time = retry_header_time; + } + + if (mRetryCount>=mMaxRetries) + { + LL_INFOS() << "Too many retries " << mRetryCount << ", will not retry" << LL_ENDL; + mShouldRetry = false; + } + if (!mRetryOn4xx && !isHttpServerErrorStatus(status)) + { + LL_INFOS() << "Non-server error " << status << ", will not retry" << LL_ENDL; + mShouldRetry = false; + } + if (mShouldRetry) + { + LL_INFOS() << "Retry count " << mRetryCount << " should retry after " << wait_time << LL_ENDL; + mRetryTimer.reset(); + mRetryTimer.setTimerExpirySec(wait_time); + } + mRetryCount++; } - + bool LLAdaptiveRetryPolicy::shouldRetry(F32& seconds_to_wait) const { - if (mRetryCount == 0) - { - // Called shouldRetry before any failure. - seconds_to_wait = F32_MAX; - return false; - } - seconds_to_wait = mShouldRetry ? (F32) mRetryTimer.getRemainingTimeF32() : F32_MAX; - return mShouldRetry; + if (mRetryCount == 0) + { + // Called shouldRetry before any failure. + seconds_to_wait = F32_MAX; + return false; + } + seconds_to_wait = mShouldRetry ? (F32) mRetryTimer.getRemainingTimeF32() : F32_MAX; + return mShouldRetry; } // Moved from httpconstants. Only used by this file. -- cgit v1.2.3