From 2fe6b4143cb693c3675bc640046b52b4a21da18d Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 16 Mar 2016 17:56:14 +0200 Subject: MAINT-5938 FIXED when Marketplace is down viewer errors 499 at each login and teleport --- indra/newview/llmarketplacefunctions.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'indra/newview/llmarketplacefunctions.cpp') diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index d5bfe1df4a..0572ac4c8c 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -174,8 +174,17 @@ protected: log_SLM_infos("Get /merchant", getStatus(), "Merchant is not migrated"); LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT); } - else - { + else if (HTTP_INTERNAL_ERROR == getStatus()) + { + // 499 includes timeout and ssl error - marketplace is down or having issues, we do not show it in this request according to MAINT-5938 + LL_WARNS("SLM") << "SLM Merchant Request failed with status: " << getStatus() + << ", reason : " << getReason() + << ", code : " << getContent().get("error_code") + << ", description : " << getContent().get("error_description") << LL_ENDL; + LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_CONNECTION_FAILURE); + } + else + { log_SLM_warning("Get /merchant", getStatus(), getReason(), getContent().get("error_code"), getContent().get("error_description")); LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_CONNECTION_FAILURE); } -- cgit v1.2.3 From 6adce024a533566bd0d48fb1f8ad49260809fb12 Mon Sep 17 00:00:00 2001 From: andreykproductengine Date: Wed, 16 Mar 2016 17:56:14 +0200 Subject: MAINT-5938 FIXED when Marketplace is down viewer errors 499 at each login and teleport --- indra/newview/llmarketplacefunctions.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llmarketplacefunctions.cpp') diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index dfa33b37ef..6cc7a0fc99 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -795,6 +795,15 @@ void LLMarketplaceData::getMerchantStatusCoro() log_SLM_infos("Get /merchant", httpCode, std::string("Merchant is not migrated")); setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_NOT_MIGRATED_MERCHANT); } + else if (httpCode == HTTP_INTERNAL_ERROR) + { + // 499 includes timeout and ssl error - marketplace is down or having issues, we do not show it in this request according to MAINT-5938 + LL_WARNS("SLM") << "SLM Merchant Request failed with status: " << httpCode + << ", reason : " << status.toString() + << ", code : " << result["error_code"].asString() + << ", description : " << result["error_description"].asString() << LL_ENDL; + LLMarketplaceData::instance().setSLMStatus(MarketplaceStatusCodes::MARKET_PLACE_CONNECTION_FAILURE); + } else { std::string err_code = result["error_code"].asString(); -- cgit v1.2.3