Merge branch 'fix-log-level' into 'master'

Fix log level

See merge request tango/fw_dns_plug!4

CMakeLists.txt

@@ -34,41 +34,4 @@ set(CMAKE_INSTALL_PREFIX /home/mesasoft/sapp_run)
 
 add_subdirectory (src) 
 
-set(CONFLIST /plug/conflist.inf)
-set(MASTER_INF "./plug/business/fw_dns_plug/fw_dns_plug.inf")
-set(MAIN_CONF /tsgconf/main.conf)
-
-file(WRITE ${PROJECT_SOURCE_DIR}/install.sh "#!/bin/sh\r\n")
-file(WRITE ${PROJECT_SOURCE_DIR}/uninstall.sh "#!/bin/sh\r\n")
-
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "DST=\${RPM_INSTALL_PREFIX}\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/uninstall.sh "DST=\${RPM_INSTALL_PREFIX}\r\n")
-
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "mkdir -p \${DST}/plug/business/\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/uninstall.sh "mkdir -p \${DST}/plug/business/\r\n")
-
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "touch \${DST}${CONFLIST}\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/uninstall.sh "touch \${DST}${CONFLIST}\r\n")
-
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "mkdir -p \${DST}/tsgconf/\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/uninstall.sh "mkdir -p \${DST}/tsgconf/\r\n")
-
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "touch \${DST}${MAIN_CONF}\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/uninstall.sh "touch \${DST}${MAIN_CONF}\r\n")
-
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "if [[ -z `grep -rn 'fw_dns_plug.inf' \${DST}${CONFLIST}` ]];then\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "\tsed -i '/\\[business\\]/a\\${MASTER_INF}' \${DST}${CONFLIST}\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "fi\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/uninstall.sh "sed -i '/fw_dns_plug.inf/d' \${DST}${CONFLIST}\r\n")
-
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "if [[ -z `grep -rn '\\[DNS_PLUG\\]' \${DST}${MAIN_CONF}` ]];then\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "\tsed -i '1i\\\\[DNS_PLUG\\]' \${DST}${MAIN_CONF}\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "\tsed -i '/\\[DNS_PLUG\\]/a\\LOG_LEVEL=30' \${DST}${MAIN_CONF}\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "\tsed -i '/\\[DNS_PLUG\\]/a\\LOG_PATH=./tsglog/fw_dns_plug/fw_dns_plug' \${DST}${MAIN_CONF}\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/install.sh "fi\r\n")
-file(APPEND ${PROJECT_SOURCE_DIR}/uninstall.sh "sed -i '/\\[DNS_PLUG\\]/,+2d' \${DST}${MAIN_CONF}\r\n")
-
-SET(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/install.sh")
-SET(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/uninstall.sh")
-
 include(Package)

cmake/Package.cmake

@@ -14,8 +14,8 @@ set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
 set(CPACK_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_BUILD}")
 execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\"$6\".\"$7}'`\"" OUTPUT_VARIABLE SYSTEM_VERSION)
 
-#execute_process(COMMAND sh changelog.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
+execute_process(COMMAND sh changelog.sh WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/cmake)
-#SET(CPACK_RPM_CHANGELOG_FILE ${PROJECT_SOURCE_DIR}/cmake/changelog.txt)
+SET(CPACK_RPM_CHANGELOG_FILE ${PROJECT_SOURCE_DIR}/cmake/changelog.txt)
 
 # RPM Build
 set(CPACK_GENERATOR "RPM")
@@ -30,18 +30,20 @@ set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
 set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
 set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
 
-set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE)
+set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
-set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
-set(CPACK_RPM_LIBRARY_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_LIBRARIES_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_LIBRARIES_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 
-set(CPACK_COMPONENT_LIBRARY_GROUP "library")
+set(CPACK_COMPONENT_LIBRARIES_GROUP "libraries")
-set(CPACK_COMPONENT_PROFILE_GROUP "library")
+set(CPACK_COMPONENT_PROFILE_GROUP "libraries")
 
 set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
 
-set(CPACK_COMPONENTS_ALL LIBRARY PROFILE)
+set(CPACK_COMPONENTS_ALL LIBRARIES PROFILE)
 
+SET(CPACK_RPM_LIBRARIES_PRE_INSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/cmake/PreInstall.sh")
+SET(CPACK_RPM_LIBRARIES_PRE_UNINSTALL_SCRIPT_FILE "${PROJECT_SOURCE_DIR}/cmake/PreUninstall.sh")
 
 set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
 

cmake/PreInstall.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+DST=${RPM_INSTALL_PREFIX}
+mkdir -p ${DST}/plug/business/
+touch ${DST}/plug/conflist.inf
+mkdir -p ${DST}/tsgconf/
+touch ${DST}/tsgconf/main.conf
+if [[ -z `grep -rn 'fw_dns_plug.inf' ${DST}/plug/conflist.inf` ]];then
+	sed -i '/\[business\]/a\./plug/business/fw_dns_plug/fw_dns_plug.inf' ${DST}/plug/conflist.inf
+fi
+if [[ -z `grep -rn '\[DNS_PLUG\]' ${DST}/tsgconf/main.conf` ]];then
+	sed -i '1i\\[DNS_PLUG\]' ${DST}/tsgconf/main.conf
+	sed -i '/\[DNS_PLUG\]/a\LOG_LEVEL=30' ${DST}/tsgconf/main.conf
+	sed -i '/\[DNS_PLUG\]/a\LOG_PATH=./tsglog/fw_dns_plug/fw_dns_plug' ${DST}/tsgconf/main.conf
+fi

cmake/PreUninstall.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+if [ $1 == 0 ]; then
+	DST=${RPM_INSTALL_PREFIX}
+
+	mkdir -p ${DST}/plug/business/
+	touch ${DST}/plug/conflist.inf
+	mkdir -p ${DST}/tsgconf/
+	touch ${DST}/tsgconf/main.conf
+
+	sed -i '/fw_dns_plug.inf/d' ${DST}/plug/conflist.inf
+	sed -i '/\[DNS_PLUG\]/,+2d' ${DST}/tsgconf/main.conf
+fi

cmake/Version.cmake

@@ -38,16 +38,12 @@ set(VERSION_BUILD "${VCS_SHORT_HASH}")
 # print information
 message(STATUS "Version: ${VERSION}-${VERSION_BUILD}")
 
-if(NOT DEFINE_GIT_VERSION)
+option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to TRUE or FALSE" TRUE)
-    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" OFF)
 
+if(DEFINE_GIT_VERSION)
 	set(GIT_VERSION
 			"${VERSION}-${CMAKE_BUILD_TYPE}-${VERSION_BUILD}-${VCS_BRANCH}-${VCS_TAG}-${VCS_DATE}")
 	string(REGEX REPLACE "[-:+/\\.]" "_" GIT_VERSION ${GIT_VERSION})
 
-if(DEFINE_GIT_VERSION)
 	add_definitions(-DGIT_VERSION=${GIT_VERSION})
-    option(DEFINE_GIT_VERSION "Set DEFINE_GIT_VERSION to OFF" ON)
-endif()
-
 endif()

src/CMakeLists.txt

@@ -8,12 +8,12 @@ include_directories(${CMAKE_SOURCE_DIR}/src)
 include_directories(/opt/MESA/include/)
 include_directories(/opt/MESA/include/tsg/)
 
-set(FW_DNS_PLUG_DEPEND_DYN_LIB  MESA_handle_logger MESA_prof_load maatframe pthread MESA_field_stat2)
+set(FW_DNS_PLUG_DEPEND_DYN_LIB  maatframe pthread MESA_field_stat2)
 
 add_library(fw_dns_plug SHARED ${SRC})
 target_link_libraries(fw_dns_plug ${FW_DNS_PLUG_DEPEND_DYN_LIB})
 set_target_properties(fw_dns_plug  PROPERTIES PREFIX "")
 
-install(TARGETS fw_dns_plug LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/fw_dns_plug COMPONENT LIBRARY)
+install(TARGETS fw_dns_plug LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/fw_dns_plug COMPONENT LIBRARIES)
 install(FILES ../bin/fw_dns_plug.inf DESTINATION ${CMAKE_INSTALL_PREFIX}/plug/business/fw_dns_plug COMPONENT PROFILE)
 

src/fw_dns_plug.cpp

@@ -314,6 +314,10 @@ static int fw_dns_send_log(struct streaminfo *a_stream, dns_info_t *dns_info, st
 	get_rr_str2json(object, dns_info, &dns_sec);
 	rr_buf=cJSON_PrintUnformatted(object);
 	TLD_append(handle, (char *)"dns_rr", (void *)rr_buf, TLD_TYPE_STRING);
+	
+	cJSON_Delete(object);
+	object=NULL;
+
 	free(rr_buf);
 	rr_buf=NULL;
 	
@@ -338,10 +342,15 @@ extern "C" char FW_DNS_PLUG_ENTRY(stSessionInfo* session_info,  void **pme, int
 	struct Maat_rule_t result[MAX_RESULT_NUM], *p_result=NULL;
 	dns_info_t *dns_info=(dns_info_t *)session_info->app_info;
 
-	if(dns_info==NULL || strlen((char *)dns_info->query_question.qname)==0)
+	if(dns_info==NULL)
+	{
+		return state;
+	}
+	
+	if(strlen((char *)dns_info->query_question.qname)==0)
 	{		
 		MESA_handle_runtime_log(g_fw_dns_plug_info.logger, 
-					RLOG_LV_FATAL,
+					RLOG_LV_DEBUG,
 					"DNS_PLUG",
 					"Qname is %s, addr: %s",
 					(dns_info==NULL) ? "NULL" : ((strlen((char *)dns_info->query_question.qname)==0) ? "NULL" : (char *)dns_info->query_question.qname),