Include callmgr log in main log

Change-Id: I429fcc013217fffb38efc962d36bc0f3dbe3dddc

diff --git a/common/include/callmgr-log.h b/common/include/callmgr-log.h
index a54db0e..8f92f8f 100644 (file)
--- a/common/include/callmgr-log.h
+++ b/common/include/callmgr-log.h
@@ -24,33 +24,36 @@ __BEGIN_DECLS
 
 #include <dlog.h>
 
-#ifndef CALLMGR_LOG_TAG
-#define CALLMGR_LOG_TAG "CALL_MGR"
+#ifdef LOG_TAG
+#undef LOG_TAG
 #endif
+#define LOG_TAG "CALL_MGR"
 
-#define CALLMGR_RLOG_ENABLED 1
-
+//#define CALLMGR_RLOG_ENABLED 1
 #ifdef CALLMGR_RLOG_ENABLED
-#define dbg(fmt,args...)   { RLOG(LOG_DEBUG, CALLMGR_LOG_TAG, fmt "\n", ##args); }
-#define info(fmt,args...)   { RLOG(LOG_INFO, CALLMGR_LOG_TAG, fmt "\n", ##args); }
-#define warn(fmt,args...)   { RLOG(LOG_WARN, CALLMGR_LOG_TAG, fmt "\n", ##args); }
-#define err(fmt,args...)   { RLOG(LOG_ERROR, CALLMGR_LOG_TAG, fmt "\n", ##args); }
-#define fatal(fmt,args...)   { RLOG(LOG_FATAL, CALLMGR_LOG_TAG, fmt "\n", ##args); }
-
-#define sec_err(fmt, arg...) {SECURE_RLOG(LOG_ERROR, CALLMGR_LOG_TAG, fmt"\n", ##arg); }
-#define sec_warn(fmt, arg...) {SECURE_RLOG(LOG_WARN, CALLMGR_LOG_TAG, fmt"\n", ##arg); }
-#define sec_dbg(fmt, arg...) {SECURE_RLOG(LOG_DEBUG, CALLMGR_LOG_TAG, fmt"\n", ##arg); }
-#else
-#define dbg(fmt,args...)   { __dlog_print(LOG_ID_MAIN, DLOG_DEBUG, CALLMGR_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); }
-#define info(fmt,args...)   { __dlog_print(LOG_ID_MAIN, DLOG_WARN, CALLMGR_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); }
-#define warn(fmt,args...)   { __dlog_print(LOG_ID_MAIN, DLOG_WARN, CALLMGR_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); }
-#define err(fmt,args...)   { __dlog_print(LOG_ID_MAIN, DLOG_ERROR, CALLMGR_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); }
-#define fatal(fmt,args...)   { __dlog_print(LOG_ID_MAIN, DLOG_FATAL, CALLMGR_LOG_TAG, "<%s:%d> " fmt "\n", __func__, __LINE__, ##args); }
-
-#define sec_err(fmt, arg...) {SECURE_LOGE(CALLMGR_LOG_TAG, fmt"\n", ##arg); }
-#define sec_warn(fmt, arg...) {SECURE_LOGW(CALLMGR_LOG_TAG, fmt"\n", ##arg); }
-#define sec_dbg(fmt, arg...) {SECURE_LOGD(CALLMGR_LOG_TAG, fmt"\n", ##arg); }
-#endif
+
+#define dbg(fmt,args...)   { RLOG(LOG_DEBUG, LOG_TAG, fmt, ##args); }
+#define info(fmt,args...)   { RLOG(LOG_INFO, LOG_TAG, fmt, ##args); }
+#define warn(fmt,args...)   { RLOG(LOG_WARN, LOG_TAG, fmt, ##args); }
+#define err(fmt,args...)   { RLOG(LOG_ERROR, LOG_TAG, fmt, ##args); }
+#define fatal(fmt,args...)   { RLOG(LOG_FATAL, LOG_TAG, fmt, ##args); }
+
+#define sec_err(fmt, arg...) { SECURE_RLOG(LOG_ERROR, LOG_TAG, fmt, ##arg); }
+#define sec_warn(fmt, arg...) { SECURE_RLOG(LOG_WARN, LOG_TAG, fmt, ##arg); }
+#define sec_dbg(fmt, arg...) { SECURE_RLOG(LOG_DEBUG, LOG_TAG, fmt, ##arg); }
+
+#else /* CALLMGR_RLOG_ENABLED */
+
+#define dbg(fmt,args...)   { LOGD(fmt, ##args); }
+#define info(fmt,args...)   { LOGI(fmt, ##args); }
+#define warn(fmt,args...)   { LOGW(fmt, ##args); }
+#define err(fmt,args...)   { LOGE(fmt, ##args); }
+#define fatal(fmt,args...)   { LOGF(fmt, ##args); }
+
+#define sec_err(fmt, arg...) { SECURE_LOGE(fmt, ##arg); }
+#define sec_warn(fmt, arg...) { SECURE_LOGW(fmt, ##arg); }
+#define sec_dbg(fmt, arg...) { SECURE_LOGD(fmt, ##arg); }
+#endif /* CALLMGR_RLOG_ENABLED */
 
 #define CM_RETURN_IF_FAIL(scalar_exp) {\
        if (!(scalar_exp)) \

diff --git a/packaging/call-manager.spec b/packaging/call-manager.spec
index 93b6b08..85c8cca 100755 (executable)
--- a/packaging/call-manager.spec
+++ b/packaging/call-manager.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 1
-%define patchlevel 76
+%define patchlevel 77
 %define ext_feature 0
 
 Name:           call-manager