Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
This commit is contained in:
@@ -905,7 +905,7 @@ AIHTTPTimeoutPolicy const* AIHTTPTimeoutPolicy::getTimeoutPolicyByName(std::stri
|
||||
#define P2(n, b) AIHTTPTimeoutPolicy n##_timeout(#n, b)
|
||||
|
||||
// Policy name Policy
|
||||
P(accountingCostResponder);
|
||||
//P(accountingCostResponder);
|
||||
P(agentStateResponder);
|
||||
P(appearanceChangeMetricsResponder);
|
||||
P(assetUploadResponder);
|
||||
@@ -993,4 +993,4 @@ P(webProfileResponders);
|
||||
P(wholeModelFeeResponder);
|
||||
P(wholeModelUploadResponder);
|
||||
P2(XMLRPCResponder, connect_40s);
|
||||
P2(crashLoggerResponder, transfer_300s);
|
||||
P2(crashLoggerResponder, transfer_300s);
|
||||
|
||||
@@ -95,7 +95,7 @@ class AIHTTPTimeoutPolicy {
|
||||
void sanity_checks(void) const;
|
||||
|
||||
// Accessors.
|
||||
char const* name(void) const { return mName; }
|
||||
char const* name(void) const { return mName ? mName : "AIHTTPTimeoutPolicyBase"; }
|
||||
U16 getConnectTimeout(std::string const& hostname) const;
|
||||
U16 getDNSLookup(void) const { return mDNSLookupGrace; }
|
||||
U16 getConnect(void) const { return mMaximumConnectTime; }
|
||||
|
||||
@@ -288,7 +288,7 @@ public:
|
||||
virtual AICapabilityType capability_type(void) const { return cap_other; }
|
||||
|
||||
// Timeout policy to use.
|
||||
virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const = 0;
|
||||
virtual AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const;
|
||||
|
||||
// The name of the derived responder object. For debugging purposes.
|
||||
virtual char const* getName(void) const = 0;
|
||||
|
||||
@@ -30,9 +30,6 @@
|
||||
#include "llcurl.h"
|
||||
#include "llhttpclient.h"
|
||||
|
||||
class AIHTTPTimeoutPolicy;
|
||||
extern AIHTTPTimeoutPolicy accountingCostResponder_timeout;
|
||||
|
||||
//===============================================================================
|
||||
LLAccountingCostManager::LLAccountingCostManager()
|
||||
{
|
||||
@@ -101,7 +98,6 @@ public:
|
||||
clearPendingRequests();
|
||||
}
|
||||
|
||||
/*virtual*/ AIHTTPTimeoutPolicy const& getHTTPTimeoutPolicy(void) const { return accountingCostResponder_timeout; }
|
||||
/*virtual*/ char const* getName(void) const { return "LLAccountingCostResponder"; }
|
||||
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user