shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-01-22 22:03:39 +03:00
Code Releases Wiki Activity

F #4809: Better timeouts for client xmlrpc-c

Browse Source
This commit is contained in:
Ruben S. Montero 2017-06-03 18:16:24 +02:00
parent 514ac43d0b
commit e80386efd6
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Client.h
View File

@ -95,7 +95,7 @@ public:
* @return 0
*/
static int call(const std::string& endpoint, const std::string& method,
const xmlrpc_c::paramList& plist, long long _timeout,
const xmlrpc_c::paramList& plist, unsigned int _timeout,
xmlrpc_c::value * const result, std::string& error);
/**

36
src/client/Client.cc
View File

@ -196,21 +196,17 @@ void Client::call(const std::string &method, const std::string format,
void Client::call(const std::string& method, const xmlrpc_c::paramList& plist,
xmlrpc_c::value * const result)
{
xmlrpc_c::clientXmlTransport_curl ctrans;
xmlrpc_c::client_xml client(&ctrans);
xmlrpc_c::clientXmlTransport_curl ctrans(
xmlrpc_c::clientXmlTransport_curl::constrOpt().timeout(timeout));
xmlrpc_c::rpcPtr rpc(method, plist);
xmlrpc_c::carriageParm_curl0 cparam(one_endpoint);
xmlrpc_c::client_xml client(&ctrans);
xmlrpc_c::rpcPtr rpc(method, plist);
rpc->start(&client, &cparam);
client.finishAsync(xmlrpc_c::timeout(timeout));
if (!rpc->isFinished())
{
rpc->finishErr(girerr::error("XMLRPC method " + method +
" timeout, resetting call"));
}
client.finishAsync(xmlrpc_c::timeout());
if (rpc->isSuccessful())
{
@ -228,14 +224,16 @@ void Client::call(const std::string& method, const xmlrpc_c::paramList& plist,
/* -------------------------------------------------------------------------- */
int Client::call(const std::string& endpoint, const std::string& method,
const xmlrpc_c::paramList& plist, long long _timeout,
const xmlrpc_c::paramList& plist, unsigned int _timeout,
xmlrpc_c::value * const result, std::string& error)
{
xmlrpc_c::carriageParm_curl0 carriage(endpoint);
xmlrpc_c::clientXmlTransport_curl transport;
xmlrpc_c::client_xml client(&transport);
xmlrpc_c::clientXmlTransport_curl transport(
xmlrpc_c::clientXmlTransport_curl::constrOpt().timeout(_timeout));
xmlrpc_c::rpcPtr rpc_client(method, plist);
xmlrpc_c::carriageParm_curl0 carriage(endpoint);
xmlrpc_c::client_xml client(&transport);
xmlrpc_c::rpcPtr rpc_client(method, plist);
int xml_rc = 0;
@ -243,13 +241,7 @@ int Client::call(const std::string& endpoint, const std::string& method,
{
rpc_client->start(&client, &carriage);
client.finishAsync(xmlrpc_c::timeout(_timeout));
if (!rpc_client->isFinished())
{
rpc_client->finishErr(girerr::error("XMLRPC method "+ method
+ " timeout, resetting call"));
}
client.finishAsync(xmlrpc_c::timeout());
if ( rpc_client->isSuccessful() )
{