ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update discovery and action timeouts and make JSONRPC timeout the last timeout

pull/544/head
Simon Stürz 2022-07-21 13:40:22 +02:00
parent 5674ba7567
commit ecaa0c8dc5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libnymea-core/integrations/thingmanagerimplementation.cpp
View File

@ -302,7 +302,7 @@ ThingDiscoveryInfo* ThingManagerImplementation::discoverThings(const ThingClassI
} }
ParamList effectiveParams = buildParams(thingClass.discoveryParamTypes(), params); ParamList effectiveParams = buildParams(thingClass.discoveryParamTypes(), params);
ThingDiscoveryInfo *discoveryInfo = new ThingDiscoveryInfo(thingClassId, effectiveParams, this, 30000); ThingDiscoveryInfo *discoveryInfo = new ThingDiscoveryInfo(thingClassId, effectiveParams, this, 40000);
connect(discoveryInfo, &ThingDiscoveryInfo::finished, this, [this, discoveryInfo](){ connect(discoveryInfo, &ThingDiscoveryInfo::finished, this, [this, discoveryInfo](){
if (discoveryInfo->status() != Thing::ThingErrorNoError) { if (discoveryInfo->status() != Thing::ThingErrorNoError) {
qCWarning(dcThingManager()) << "Discovery failed:" << discoveryInfo->status() << discoveryInfo->displayMessage(); qCWarning(dcThingManager()) << "Discovery failed:" << discoveryInfo->status() << discoveryInfo->displayMessage();
@ -1341,7 +1341,7 @@ ThingActionInfo *ThingManagerImplementation::executeAction(const Action &action)
ParamList finalParams = buildParams(actionType.paramTypes(), action.params()); ParamList finalParams = buildParams(actionType.paramTypes(), action.params());
finalAction.setParams(finalParams); finalAction.setParams(finalParams);
ThingActionInfo *info = new ThingActionInfo(thing, finalAction, this, 30000); ThingActionInfo *info = new ThingActionInfo(thing, finalAction, this, 15000);
IntegrationPlugin *plugin = m_integrationPlugins.value(thing->pluginId()); IntegrationPlugin *plugin = m_integrationPlugins.value(thing->pluginId());
if (!plugin) { if (!plugin) {

4
libnymea/jsonrpc/jsonreply.cpp
View File

@ -134,10 +134,10 @@ void JsonReply::setCommandId(int commandId)
m_commandId = commandId; m_commandId = commandId;
} }
/*! Start the timeout timer for this \l{JsonReply}. The default timeout is 15 seconds. */ /*! Start the timeout timer for this \l{JsonReply}. The default timeout is 45 seconds. */
void JsonReply::startWait() void JsonReply::startWait()
{ {
m_timeout.start(30000); m_timeout.start(45000);
} }
void JsonReply::timeout() void JsonReply::timeout()