Reduce log message

Change-Id: I4afafd990f72a7ba0e5744ac44153cc029d233f3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cff6104..ef06077 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,7 @@ ADD_DEFINITIONS("-DEXEC_NAME=\"${PROJECT_NAME}\"")
 ADD_DEFINITIONS("-DMASTER_PKGNAME=\"data-provider-master\"")
 ADD_DEFINITIONS("-DSLAVE_PKGNAME=\"org.tizen.data-provider-slave\"")
 ADD_DEFINITIONS("-DSOCKET_FILE=\"/opt/usr/share/live_magazine/.live.socket\"")
+ADD_DEFINITIONS("-DCONF_FILE=\"/usr/share/data-provider-master/conf.ini\"")
 
 ADD_DEFINITIONS("-DNDEBUG")
 #ADD_DEFINITIONS("-D_ENABLE_MCHECK")

diff --git a/packaging/org.tizen.data-provider-slave.spec b/packaging/org.tizen.data-provider-slave.spec
index 18975b5..2aca196 100644 (file)
--- a/packaging/org.tizen.data-provider-slave.spec
+++ b/packaging/org.tizen.data-provider-slave.spec
@@ -2,7 +2,7 @@
 
 Name: org.tizen.data-provider-slave
 Summary: Plugin type livebox service provider.
-Version: 0.11.7
+Version: 0.11.8
 Release: 1
 Group: HomeTF/Livebox
 License: Flora License

diff --git a/src/conf.c b/src/conf.c
index 7fe3959..3a5ae48 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -101,13 +101,11 @@ static void conf_update_size(void)
 static void use_xmonitor(char *buffer)
 {
        g_conf.use_xmonitor = !strcasecmp(buffer, "true");
-       DbgPrint("Use xmonitor: %d\n", g_conf.use_xmonitor);
 }
 
 static void use_sw_backend_handler(char *buffer)
 {
        g_conf.use_sw_backend = !strcasecmp(buffer, "true");
-       DbgPrint("SW Backend: %d\n", g_conf.use_sw_backend);
 }
 
 static void provider_method_handler(char *buffer)
@@ -115,41 +113,33 @@ static void provider_method_handler(char *buffer)
        g_conf.provider_method = strdup(buffer);
        if (!g_conf.provider_method)
                ErrPrint("Heap: %s\n", strerror(errno));
-
-       DbgPrint("Method: %s\n", g_conf.provider_method);
 }
 
 static void debug_mode_handler(char *buffer)
 {
        g_conf.debug_mode = !strcasecmp(buffer, "true");
-       DbgPrint("Debug mode: %d\n", g_conf.debug_mode);
 }
 
 static void overwrite_content_handler(char *buffer)
 {
        g_conf.overwrite_content = !strcasecmp(buffer, "true");
-       DbgPrint("Overwrite Content: %d\n", g_conf.overwrite_content);
 }
 
 static void com_core_thread_handler(char *buffer)
 {
        g_conf.com_core_thread = !strcasecmp(buffer, "true");
-       DbgPrint("Com core thread: %d\n", g_conf.com_core_thread);
 }
 
 static void base_width_handler(char *buffer)
 {
        if (sscanf(buffer, "%d", &g_conf.base_width) != 1)
                ErrPrint("Failed to parse the base_width\n");
-
-       DbgPrint("Base width: %d\n", g_conf.base_width);
 }
 
 static void base_height_handler(char *buffer)
 {
        if (sscanf(buffer, "%d", &g_conf.base_height) != 1)
                ErrPrint("Failed to parse the base_height\n");
-       DbgPrint("Base height: %d\n", g_conf.base_height);
 }
 
 static void minimum_period_handler(char *buffer)
@@ -164,7 +154,6 @@ static void script_handler(char *buffer)
        g_conf.default_conf.script = strdup(buffer);
        if (!g_conf.default_conf.script)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Default script: %s\n", g_conf.default_conf.script);
 }
 
 static void default_abi_handler(char *buffer)
@@ -172,7 +161,6 @@ static void default_abi_handler(char *buffer)
        g_conf.default_conf.abi = strdup(buffer);
        if (!g_conf.default_conf.abi)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Default ABI: %s\n", g_conf.default_conf.abi);
 }
 
 static void default_group_handler(char *buffer)
@@ -180,7 +168,6 @@ static void default_group_handler(char *buffer)
        g_conf.default_conf.pd_group = strdup(buffer);
        if (!g_conf.default_conf.pd_group)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Default PD Group: %s\n", g_conf.default_conf.pd_group);
 }
 
 static void default_period_handler(char *buffer)
@@ -202,7 +189,6 @@ static void default_content_handler(char *buffer)
        g_conf.default_content = strdup(buffer);
        if (!g_conf.default_content)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Default content: %s\n", g_conf.default_content);
 }
 
 static void default_title_handler(char *buffer)
@@ -210,14 +196,12 @@ static void default_title_handler(char *buffer)
        g_conf.default_title = strdup(buffer);
        if (!g_conf.default_title)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Default title: %s\n", g_conf.default_title);
 }
 
 static void minimum_space_handler(char *buffer)
 {
        if (sscanf(buffer, "%lu", &g_conf.minimum_space) != 1)
                ErrPrint("Failed to parse the minimum_space\n");
-       DbgPrint("Minimum space: %lu\n", g_conf.minimum_space);
 }
 
 static void replace_tag_handler(char *buffer)
@@ -225,7 +209,6 @@ static void replace_tag_handler(char *buffer)
        g_conf.replace_tag = strdup(buffer);
        if (!g_conf.replace_tag)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Replace Tag: %s\n", g_conf.replace_tag);
 }
 
 static void slave_ttl_handler(char *buffer)
@@ -246,21 +229,18 @@ static void max_log_line_handler(char *buffer)
 {
        if (sscanf(buffer, "%d", &g_conf.max_log_line) != 1)
                ErrPrint("Failed to parse the max_log_line\n");
-       DbgPrint("Max log line: %d\n", g_conf.max_log_line);
 }
 
 static void max_log_file_handler(char *buffer)
 {
        if (sscanf(buffer, "%d", &g_conf.max_log_file) != 1)
                ErrPrint("Failed to parse the max_log_file\n");
-       DbgPrint("Max log file: %d\n", g_conf.max_log_file);
 }
 
 static void sqlite_flush_max_handler(char *buffer)
 {
        if (sscanf(buffer, "%lu", &g_conf.sqlite_flush_max) != 1)
                ErrPrint("Failed to parse the sqlite_flush_max\n");
-       DbgPrint("Flush size: %lu\n", g_conf.sqlite_flush_max);
 }
 
 static void db_path_handler(char *buffer)
@@ -268,7 +248,6 @@ static void db_path_handler(char *buffer)
        g_conf.path.db = strdup(buffer);
        if (!g_conf.path.db)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("DB Path: %s\n", g_conf.path.db);
 }
 
 static void reader_path_handler(char *buffer)
@@ -276,7 +255,6 @@ static void reader_path_handler(char *buffer)
        g_conf.path.reader = strdup(buffer);
        if (!g_conf.path.reader)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Reader Path: %s\n", g_conf.path.reader);
 }
 
 static void always_path_handler(char *buffer)
@@ -284,7 +262,6 @@ static void always_path_handler(char *buffer)
        g_conf.path.always = strdup(buffer);
        if (!g_conf.path.always)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Always Path: %s\n", g_conf.path.always);
 }
 
 static void log_path_handler(char *buffer)
@@ -292,7 +269,6 @@ static void log_path_handler(char *buffer)
        g_conf.path.slave_log = strdup(buffer);
        if (!g_conf.path.slave_log)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("LOG Path: %s\n", g_conf.path.slave_log);
 }
 
 static void script_port_path_handler(char *buffer)
@@ -300,7 +276,6 @@ static void script_port_path_handler(char *buffer)
        g_conf.path.script_port = strdup(buffer);
        if (!g_conf.path.script_port)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Script Port PATH: %s\n", g_conf.path.script_port);
 }
 
 static void share_path_handler(char *buffer)
@@ -308,7 +283,6 @@ static void share_path_handler(char *buffer)
        g_conf.path.image = strdup(buffer);
        if (!g_conf.path.image)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Shared folder: %s\n", g_conf.path.image);
 }
 
 static void input_path_handler(char *buffer)
@@ -316,7 +290,6 @@ static void input_path_handler(char *buffer)
        g_conf.path.input = strdup(buffer);
        if (!g_conf.path.input)
                ErrPrint("Heap: %s\n", strerror(errno));
-       DbgPrint("Input path: %s\n", g_conf.path.input);
 }
 
 static void ping_time_handler(char *buffer)
@@ -331,7 +304,6 @@ static void slave_max_loader(char *buffer)
 {
        if (sscanf(buffer, "%d", &g_conf.slave_max_load) != 1)
                ErrPrint("Failed to parse the slave_max_load\n");
-       DbgPrint("Max load: %d\n", g_conf.slave_max_load);
 }
 
 HAPI int conf_loader(void)
@@ -493,7 +465,7 @@ HAPI int conf_loader(void)
 
        conf_update_size();
 
-       fp = fopen("/usr/share/data-provider-master/conf.ini", "rt");
+       fp = fopen(CONF_FILE, "rt");
        if (!fp) {
                ErrPrint("Error: %s\n", strerror(errno));
                return LB_STATUS_ERROR_IO;
@@ -629,7 +601,6 @@ HAPI int conf_loader(void)
 
                                if (token_idx >= 0 && token_handler[token_idx].handler) {
                                        buffer[buffer_idx] = '\0';
-                                       DbgPrint("BUFFER: [%s]\n", buffer);
                                        token_handler[token_idx].handler(buffer);
                                }
 

diff --git a/src/main.c b/src/main.c
index c77501b..62bc58e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -195,9 +195,10 @@ static bool app_create(void *data)
        int ret;
        int size = DEFAULT_FONT_SIZE;
 
+       DbgPrint("Scale factor: %lf\n", elm_config_scale_get());
+
        ret = conf_loader();
        DbgPrint("Configureation manager is initiated: %d\n", ret);
-       DbgPrint("Scale factor: %lf\n", elm_config_scale_get());
 
        if (COM_CORE_THREAD)
                setenv("PROVIDER_COM_CORE_THREAD", "true", 0);
@@ -220,10 +221,10 @@ static bool app_create(void *data)
        DbgPrint("Content update monitor is initiated: %d\n", ret);
 
        ret = vconf_notify_key_changed("db/setting/accessibility/font_name", font_changed_cb, NULL);
-       DbgPrint("System font is changed: %d\n", ret);
+       DbgPrint("System font changed callback is added: %d\n", ret);
        
        ret = system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_FONT_SIZE, font_size_cb, NULL);
-       DbgPrint("System font size is changed: %d\n", ret);
+       DbgPrint("System font size changed callback is added: %d\n", ret);
 
        ret = vconf_notify_key_changed(VCONFKEY_SYSMAN_STIME, time_changed_cb, NULL);
        DbgPrint("System time changed event callback added: %d\n", ret);
@@ -232,13 +233,13 @@ static bool app_create(void *data)
        DbgPrint("MMC status changed event callback added: %d\n", ret);
 
        s_info.font_name = vconf_get_str("db/setting/accessibility/font_name");
-       DbgPrint("Current font: %s\n", s_info.font_name);
+       DbgPrint("Current font is [%s]\n", s_info.font_name);
 
        ret = system_settings_get_value_int(SYSTEM_SETTINGS_KEY_FONT_SIZE, &size);
-       DbgPrint("Get fontsize: %d\n", ret);
+       DbgPrint("Current font size get: %d\n", ret);
 
        s_info.font_size = convert_font_size(size);
-       DbgPrint("Current size: %d\n", s_info.font_size);
+       DbgPrint("Current font size: %d\n", s_info.font_size);
 
        return TRUE;
 }