From dfe8fccdba097542d80dcd94faad0a6212e8719b Mon Sep 17 00:00:00 2001 From: Li Zhang Date: Fri, 26 Aug 2016 15:19:41 +0800 Subject: [PATCH] Fix SocketConfigServer module loading failure issue Change-Id: Ifde16168dd6611cf0de4f3dc1fa9000ef0e36741 --- ism/modules/panelagent/socketconfigserver/Makefile.am | 10 +++++----- ism/src/isf_panel_agent_manager.cpp | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ism/modules/panelagent/socketconfigserver/Makefile.am b/ism/modules/panelagent/socketconfigserver/Makefile.am index 6ac0b5f..ada3ae7 100644 --- a/ism/modules/panelagent/socketconfigserver/Makefile.am +++ b/ism/modules/panelagent/socketconfigserver/Makefile.am @@ -21,7 +21,7 @@ AM_CPPFLAGS = -I$(top_builddir) \ noinst_HEADERS = -CONFIG_SOCKETCONFIGSERVER_PANELAGENT_MODULE = socket_config_server.la +CONFIG_SOCKETCONFIGSERVER_PANELAGENT_MODULE = socketconfigserver.la if SCIM_LD_VERSION_SCRIPT @@ -31,11 +31,11 @@ endif moduledir = @SCIM_MODULE_PATH@/$(SCIM_BINARY_VERSION)/PanelAgent module_LTLIBRARIES = $(CONFIG_SOCKETCONFIGSERVER_PANELAGENT_MODULE) -socket_config_server_la_SOURCES = socket_config_server_panel_agent_module.cpp +socketconfigserver_la_SOURCES = socket_config_server_panel_agent_module.cpp -socket_config_server_la_CXXFLAGS = @DLOG_CFLAGS@ @ECORE_CFLAGS@ +socketconfigserver_la_CXXFLAGS = @DLOG_CFLAGS@ @ECORE_CFLAGS@ -socket_config_server_la_LDFLAGS = -avoid-version \ +socketconfigserver_la_LDFLAGS = -avoid-version \ -rpath $(moduledir) \ -module \ $(LD_VERSION_SCRIPT_OPTION) \ @@ -44,4 +44,4 @@ socket_config_server_la_LDFLAGS = -avoid-version \ @DLOG_LIBS@ \ @ECORE_LIBS@ -socket_config_server_la_LIBADD = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la +socketconfigserver_la_LIBADD = $(top_builddir)/ism/src/libscim@SCIM_EPOCH@.la diff --git a/ism/src/isf_panel_agent_manager.cpp b/ism/src/isf_panel_agent_manager.cpp index e732440..6440a0a 100644 --- a/ism/src/isf_panel_agent_manager.cpp +++ b/ism/src/isf_panel_agent_manager.cpp @@ -120,14 +120,14 @@ bool PanelAgentManager::initialize (InfoManager* info_manager, const ConfigPoint PanelAgentModule* _panel_agent_module = new PanelAgentModule; if (!_panel_agent_module) { - LOGD (""); + LOGW (""); continue; } _panel_agent_module->load (*it, config); if (!_panel_agent_module->valid ()) { - LOGD (""); + LOGW (""); delete _panel_agent_module; continue; } @@ -135,7 +135,7 @@ bool PanelAgentManager::initialize (InfoManager* info_manager, const ConfigPoint PanelAgentPointer _panelagent = _panel_agent_module->get_instance (); if (_panelagent.null ()) { - LOGD (""); + LOGW (""); delete _panel_agent_module; continue; } -- 2.7.4