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

fixed log error and action execution from the log engine

pull/135/head
Simon Stürz 2015-07-13 17:35:04 +02:00 committed by Michael Zanetti
parent 5d91331683
commit df99a2f438
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/guhcore.cpp
View File

@ -496,7 +496,7 @@ void GuhCore::gotEvent(const Event &event)
foreach (const RuleAction &ruleAction, actions) {
Action action = ruleAction.toAction();
qCDebug(dcRuleEngine) << "executing action" << ruleAction.actionTypeId();
DeviceManager::DeviceError status = m_deviceManager->executeAction(action);
DeviceManager::DeviceError status = executeAction(action);
switch(status) {
case DeviceManager::DeviceErrorNoError:
break;
@ -512,7 +512,9 @@ void GuhCore::gotEvent(const Event &event)
default:
qCWarning(dcRuleEngine) << "Error executing action:" << status;
}
m_logger->logAction(action, status == DeviceManager::DeviceErrorNoError ? Logging::LoggingLevelInfo : Logging::LoggingLevelAlert, status);
if (status != DeviceManager::DeviceErrorAsync)
m_logger->logAction(action, status == DeviceManager::DeviceErrorNoError ? Logging::LoggingLevelInfo : Logging::LoggingLevelAlert, status);
}
}