summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorMonty Brandenberg <monty@lindenlab.com>2013-06-27 13:55:05 -0400
committerMonty Brandenberg <monty@lindenlab.com>2013-06-27 13:55:05 -0400
commit2cdddab384ce0bf4f6786a3fee08bea3f467e7c9 (patch)
tree1ec71befa5fb7f26adf2933feff561d63a6f8453 /indra/llcorehttp
parentd6cbcd591aea32357d50b266efe8a95754302cbf (diff)
SH-4310/BUG-2810/MAINT-2794 Better status checking and error logging in Mesh code.
Pay correct attention to status codes coming back from services. Generate better and consistent error messages when problems arise. There's more to do in error handling, need a way to cleanly fail all request types, only have that for LOD at this point. Do better keeping the HTTP pipeline between the low and high water marks. This was made challenging because the outer most code couldn't really see what's going on internally (whose actions are delayed in a worker thread). More to do here, the debug-like requests don't honor limits, that will come later. Made retry counts available from llcorehttp which can be used by the throttle-anticipating logic to advance the count. It helps but it reinforces the coupling between viewer and server which I do not like.
Diffstat (limited to 'indra/llcorehttp')
-rwxr-xr-xindra/llcorehttp/httpresponse.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llcorehttp/httpresponse.h b/indra/llcorehttp/httpresponse.h
index a7f296e03f..bb4b59c16e 100755
--- a/indra/llcorehttp/httpresponse.h
+++ b/indra/llcorehttp/httpresponse.h
@@ -147,8 +147,14 @@ public:
/// Get and set retry attempt information on the request.
void getRetries(unsigned int * retries, unsigned int * retries_503) const
{
- *retries = mRetries;
- *retries_503 = m503Retries;
+ if (retries)
+ {
+ *retries = mRetries;
+ }
+ if (retries_503)
+ {
+ *retries_503 = m503Retries;
+ }
}
void setRetries(unsigned int retries, unsigned int retries_503)