Skip to content
Snippets Groups Projects
Commit 2cc76d0b authored by Andrey Kleshchev's avatar Andrey Kleshchev
Browse files

SL-14388 Listing status issues

Log issue and try to recover
parent 9a168832
No related branches found
No related tags found
No related merge requests found
...@@ -1025,6 +1025,12 @@ void LLMarketplaceData::createSLMListingCoro(LLUUID folderId, LLUUID versionId, ...@@ -1025,6 +1025,12 @@ void LLMarketplaceData::createSLMListingCoro(LLUUID folderId, LLUUID versionId,
log_SLM_infos("Post /listings", status.getType(), result); log_SLM_infos("Post /listings", status.getType(), result);
if (!result.has("listings") || !result["listings"].isArray() || result["listings"].size() == 0)
{
LL_INFOS("SLM") << "Received an empty response for folder " << folderId << LL_ENDL;
return;
}
// Extract the info from the results // Extract the info from the results
for (LLSD::array_iterator it = result["listings"].beginArray(); for (LLSD::array_iterator it = result["listings"].beginArray();
it != result["listings"].endArray(); ++it) it != result["listings"].endArray(); ++it)
...@@ -1092,6 +1098,19 @@ void LLMarketplaceData::updateSLMListingCoro(LLUUID folderId, S32 listingId, LLU ...@@ -1092,6 +1098,19 @@ void LLMarketplaceData::updateSLMListingCoro(LLUUID folderId, S32 listingId, LLU
log_SLM_infos("Put /listing", status.getType(), result); log_SLM_infos("Put /listing", status.getType(), result);
if (!result.has("listings") || !result["listings"].isArray() || result["listings"].size() == 0)
{
LL_INFOS("SLM") << "Received an empty response for listing " << listingId << " folder " << folderId << LL_ENDL;
// Try to get listing more directly after a delay
const float FORCE_UPDATE_TIMEOUT = 5.0;
llcoro::suspendUntilTimeout(FORCE_UPDATE_TIMEOUT);
if (!LLApp::isExiting() && LLMarketplaceData::instanceExists())
{
getSLMListing(listingId);
}
return;
}
// Extract the info from the Json string // Extract the info from the Json string
for (LLSD::array_iterator it = result["listings"].beginArray(); for (LLSD::array_iterator it = result["listings"].beginArray();
it != result["listings"].endArray(); ++it) it != result["listings"].endArray(); ++it)
......
...@@ -47,6 +47,7 @@ class LLViewerJoystick : public LLSingleton<LLViewerJoystick> ...@@ -47,6 +47,7 @@ class LLViewerJoystick : public LLSingleton<LLViewerJoystick>
{ {
LLSINGLETON(LLViewerJoystick); LLSINGLETON(LLViewerJoystick);
virtual ~LLViewerJoystick(); virtual ~LLViewerJoystick();
LOG_CLASS(LLViewerJoystick);
public: public:
void init(bool autoenable); void init(bool autoenable);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment