livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-5938 FIXED when Marketplace is down viewer errors 499 at each login and teleport

meow-7.2.2
andreykproductengine 2016-03-16 17:56:14 +02:00
parent bcf2686d39
commit 2fe6b4143c
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llmarketplacefunctions.cpp
View File

@ -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);
}