diff --git a/libnymea-core/jsonrpc/ruleshandler.cpp b/libnymea-core/jsonrpc/ruleshandler.cpp index b20187a9..41643f45 100644 --- a/libnymea-core/jsonrpc/ruleshandler.cpp +++ b/libnymea-core/jsonrpc/ruleshandler.cpp @@ -58,7 +58,6 @@ #include "loggingcategories.h" #include -#include namespace nymeaserver { @@ -216,9 +215,6 @@ JsonReply *RulesHandler::GetRuleDetails(const QVariantMap ¶ms) return createReply(statusToReply(RuleEngine::RuleErrorRuleNotFound)); } QVariantMap returns = statusToReply(RuleEngine::RuleErrorNoError); - qWarning() << "Have rule" << rule; - QJsonDocument jsonDoc = QJsonDocument::fromVariant(JsonTypes::packRule(rule)); - qWarning() << "packed:" << jsonDoc.toJson(); returns.insert("rule", JsonTypes::packRule(rule)); return createReply(returns); } diff --git a/libnymea-core/ruleengine.cpp b/libnymea-core/ruleengine.cpp index 7612f7ec..34369854 100644 --- a/libnymea-core/ruleengine.cpp +++ b/libnymea-core/ruleengine.cpp @@ -680,7 +680,6 @@ RuleEngine::RuleError RuleEngine::addRule(const Rule &rule, bool fromEdit) return RuleError::RuleErrorActionTypeNotFound; } foreach (const ParamType &ifaceActionParamType, ifaceActionType.paramTypes()) { - qWarning() << "iface requires param:" << ifaceActionParamType.name(); if (!action.ruleActionParams().hasParam(ifaceActionParamType.name())) { qCWarning(dcRuleEngine()) << "Cannot create rule. Interface action" << iface.name() << ":" << action.interfaceAction() << "requires a" << ifaceActionParamType.name() << "param of type" << QVariant::typeToName(ifaceActionParamType.type()); return RuleError::RuleErrorMissingParameter; @@ -751,7 +750,6 @@ RuleEngine::RuleError RuleEngine::addRule(const Rule &rule, bool fromEdit) return RuleError::RuleErrorActionTypeNotFound; } foreach (const ParamType &ifaceActionParamType, ifaceActionType.paramTypes()) { - qWarning() << "iface requires param:" << ifaceActionParamType.name(); if (!ruleAction.ruleActionParams().hasParam(ifaceActionParamType.name())) { qCWarning(dcRuleEngine()) << "Cannot create rule. Interface action" << iface.name() << ":" << ruleAction.interfaceAction() << "requires a" << ifaceActionParamType.name() << "param of type" << QVariant::typeToName(ifaceActionParamType.type()); return RuleError::RuleErrorMissingParameter; @@ -1283,7 +1281,7 @@ void RuleEngine::appendRule(const Rule &rule) { Rule newRule = rule; newRule.setStatesActive(newRule.stateEvaluator().evaluate()); - qCDebug(dcRuleEngineDebug()) << "Appending new Rule:" << newRule; + qCDebug(dcRuleEngine()) << "Adding Rule:" << newRule; m_rules.insert(rule.id(), newRule); m_ruleIds.append(rule.id()); } @@ -1450,7 +1448,7 @@ void RuleEngine::saveRule(const Rule &rule) settings.endGroup(); } settings.endGroup(); - qWarning() << "#### Saved rule to config:" << rule; + qCDebug(dcRuleEngineDebug()) << "Saved rule to config:" << rule; } } diff --git a/libnymea-core/stateevaluator.cpp b/libnymea-core/stateevaluator.cpp index ee86602b..f27dd853 100644 --- a/libnymea-core/stateevaluator.cpp +++ b/libnymea-core/stateevaluator.cpp @@ -210,7 +210,6 @@ QList StateEvaluator::containedDevices() const The \a groupName will normally be the corresponding \l Rule. */ void StateEvaluator::dumpToSettings(NymeaSettings &settings, const QString &groupName) const { - qWarning() << "Dumping to settings:" << groupName; settings.beginGroup(groupName); settings.beginGroup("stateDescriptor"); @@ -263,7 +262,6 @@ StateEvaluator StateEvaluator::loadFromSettings(NymeaSettings &settings, const Q } settings.endGroup(); settings.endGroup(); - qWarning() << "*** loading from settings" << groupName << ret; return ret; } diff --git a/tests/scripts/getruledetails.sh b/tests/scripts/getruledetails.sh index ee7c101a..f23490d1 100755 --- a/tests/scripts/getruledetails.sh +++ b/tests/scripts/getruledetails.sh @@ -3,6 +3,5 @@ if [ -z $2 ]; then echo "usage: $0 host ruleId" else - echo '{"id":1, "method":"Rules.GetRuleDetails", "params": {"ruleId": "'$2'"}}' (echo '{"id":1, "method":"Rules.GetRuleDetails", "params": {"ruleId": "'$2'"}}'; sleep 1) | nc $1 2222 fi