summaryrefslogtreecommitdiff
path: root/src/components/functional_module
diff options
context:
space:
mode:
authorAndrey Oleynik <aoleynik@luxoft.com>2017-08-25 16:40:51 +0300
committerAndrey Oleynik <ms_username@outlook.com>2017-08-30 16:48:47 +0300
commit25e19887027d95d98bc07dd612b05f6b3ddb4ae6 (patch)
tree16186eec2df38e80e66ce145116c987ad7465429 /src/components/functional_module
parente7f90bf839854cb9a46f2b6e153105f03e8d838f (diff)
downloadsdl_core-25e19887027d95d98bc07dd612b05f6b3ddb4ae6.tar.gz
Moves logging to another place
Diffstat (limited to 'src/components/functional_module')
-rw-r--r--src/components/functional_module/include/functional_module/plugin_manager.h2
-rw-r--r--src/components/functional_module/src/plugin_manager.cc10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/components/functional_module/include/functional_module/plugin_manager.h b/src/components/functional_module/include/functional_module/plugin_manager.h
index 1c58f581fc..ceb19bdf59 100644
--- a/src/components/functional_module/include/functional_module/plugin_manager.h
+++ b/src/components/functional_module/include/functional_module/plugin_manager.h
@@ -50,7 +50,7 @@ class PluginManager : public ModuleObserver {
void UnloadPlugins();
/**
- * @brief ProcessMessage forwards modules message to modules if any is
+ * @brief ProcessMessage forwards mobile message to modules if any is
* subsribed for the message.
* @param msg Mobile message to process
* @return Result of processing
diff --git a/src/components/functional_module/src/plugin_manager.cc b/src/components/functional_module/src/plugin_manager.cc
index 2e41f225a7..71f21c8afd 100644
--- a/src/components/functional_module/src/plugin_manager.cc
+++ b/src/components/functional_module/src/plugin_manager.cc
@@ -56,7 +56,6 @@ const std::string ExtractMethodName(application_manager::MessagePtr msg) {
if (value.isMember(kMethod)) {
return value.get(kMethod, "").asCString();
- // Response from HMI
}
if (value.isMember(kResult)) {
const Json::Value& result = value.get(kResult, Json::Value());
@@ -67,10 +66,7 @@ const std::string ExtractMethodName(application_manager::MessagePtr msg) {
const Json::Value& data = error.get(kData, Json::Value());
return data.get(kMethod, "").asCString();
}
- LOG4CXX_WARN(logger_,
- "Message with HMI protocol version can not be handled by "
- "plugin manager, because required 'method' field was not "
- "found, or was containing an invalid string.");
+
return std::string();
}
} // namespace
@@ -208,6 +204,10 @@ ProcessResult PluginManager::ProcessHMIMessage(
const std::string& msg_method = ExtractMethodName(msg);
if (msg_method.empty()) {
+ LOG4CXX_WARN(logger_,
+ "Message with HMI protocol version can not be handled by "
+ "plugin manager, because required 'method' field was not "
+ "found, or was containing an invalid string.");
return ProcessResult::CANNOT_PROCESS;
}