Delete special Characters in the log message

Change-Id: I4c8572e74ed8753e0390d2255ddb75870dc362fe
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/src/common/include/media-common-db-svc.h b/src/common/include/media-common-db-svc.h
index ff1b3c4..42345df 100755 (executable)
--- a/src/common/include/media-common-db-svc.h
+++ b/src/common/include/media-common-db-svc.h
@@ -149,9 +149,7 @@ int ms_check_folder_exist(void **handle, const char *storage_id, const char *fol
 int ms_get_folder_id(void **handle, const char *storage_id, const char *path, char **folder_id);
 int ms_get_media_type(void **handle, const char *path, int *media_type);
 
-/****************************************************************************************************
-FOR BULK COMMIT
-*****************************************************************************************************/
+/* FOR BULK COMMIT */
 void ms_register_start(void **handle, ms_noti_switch_e noti_status, int pid);
 void ms_register_end(void **handle, uid_t uid);
 void ms_validate_start(void **handle);

diff --git a/src/common/media-common-db-svc.c b/src/common/media-common-db-svc.c
index 201a381..9a62846 100755 (executable)
--- a/src/common/media-common-db-svc.c
+++ b/src/common/media-common-db-svc.c
@@ -102,7 +102,7 @@ static int __ms_token_data(char *buf, char **name)
 
        pos = strstr(buf, EXT);
        if (pos == NULL) {
-               MS_DBG_ERR("This is not shared object library.");
+               MS_DBG_ERR("This is not shared object library");
                name = NULL;
                return -1;
        } else {
@@ -1160,10 +1160,7 @@ int ms_get_folder_id(void **handle, const char *storage_id, const char *path, ch
        return res;
 }
 
-/****************************************************************************************************
-FOR BULK COMMIT
-*****************************************************************************************************/
-
+/* FOR BULK COMMIT */
 void ms_register_start(void **handle, ms_noti_switch_e noti_status, int pid)
 {
        int lib_index;

diff --git a/src/common/media-common-external-storage.c b/src/common/media-common-external-storage.c
index 490cb7e..397bc0a 100755 (executable)
--- a/src/common/media-common-external-storage.c
+++ b/src/common/media-common-external-storage.c
@@ -133,7 +133,7 @@ void update_lang(void)
                if (r == NULL) {
                        r = setlocale(LC_ALL, lang);
                        if (r != NULL)
-                               MS_DBG_WARN("*****appcore setlocale=%s", r);
+                               MS_DBG_WARN("Appcore setlocale[%s]", r);
                }
                free(lang);
        }

diff --git a/src/scanner-v2/media-scanner-device-block-v2.c b/src/scanner-v2/media-scanner-device-block-v2.c
index b2e4911..81702e6 100755 (executable)
--- a/src/scanner-v2/media-scanner-device-block-v2.c
+++ b/src/scanner-v2/media-scanner-device-block-v2.c
@@ -38,9 +38,7 @@
 #ifdef _USE_DEVICED_DBUS
 static void __msc_usb_remove_event(const char *mount_path)
 {
-       MS_DBG_WARN("===========================================================");
        MS_DBG_WARN("USB REMOVED, mountpath : %s", mount_path);
-       MS_DBG_WARN("===========================================================");
 
        int update_status = -1;
        int remain_request = 0;
@@ -143,9 +141,7 @@ void msc_device_block_changed_cb(usb_device_h usb_device, char *action, void *us
        mount_path = usb_device_get_mountpath(usb_device);
 
        if (!strcmp(action, "blocked")) {
-               MS_DBG_WARN("===========================================================");
                MS_DBG_ERR("USB BLOCKED, mountpath : %s", mount_path);
-               MS_DBG_WARN("===========================================================");
                int status = -1;
 
                if (!ms_config_get_int(VCONFKEY_FILEMANAGER_DB_STATUS, &status)) {
@@ -173,9 +169,7 @@ void msc_device_block_changed_cb(usb_device_h usb_device, char *action, void *us
                        msc_set_cancel_extract_item(mount_path, -1);
                }
        } else if (!strcmp(action, "unmounted")) {
-               MS_DBG_WARN("===========================================================");
                MS_DBG_ERR("USB UNMOUNT , mountpath : %s", mount_path);
-               MS_DBG_WARN("===========================================================");
        }
 
        free_usb_device_h(usb_device);

diff --git a/src/scanner-v2/media-scanner-v2.c b/src/scanner-v2/media-scanner-v2.c
index 9bd5c09..9a532a6 100755 (executable)
--- a/src/scanner-v2/media-scanner-v2.c
+++ b/src/scanner-v2/media-scanner-v2.c
@@ -219,7 +219,7 @@ int main(int argc, char **argv)
        int err = -1;
        int fd = -1;
 
-       MS_DBG_WARN("[No-Error] ========== Scanner start ========");
+       MS_DBG_INFO("Scanner-V2 start");
 
        __msc_add_event_receiver(NULL);
 
@@ -282,12 +282,9 @@ int main(int argc, char **argv)
        storage_extract_thread = g_thread_new("storage_extract_thread", (GThreadFunc)msc_storage_extract_thread, NULL);
        folder_extract_thread = g_thread_new("folder_extract_thread", (GThreadFunc)msc_folder_extract_thread, NULL);
 
-       MS_DBG_INFO("scanner v2 is ready");
-
+       MS_DBG_INFO("Scanner-V2 is ready");
        msc_send_ready();
-       MS_DBG_WARN("[No-Error] ========== Scanner is ready ========");
-
-       MS_DBG_WARN("[No-Error] ========== Scanner is running ========");
+       MS_DBG_INFO("Scanner-V2 is running");
 
 #ifdef _SET_VIP_PROCESS
        /*Set VIP Process*/
@@ -322,7 +319,7 @@ EXIT:
                MS_DBG_ERR("set power off status to 0 failed");
        }
 
-       MS_DBG_WARN("SCANNER V2 IS END");
+       MS_DBG_INFO("Scanner-V2 is shutting down");
        return 0;
 }
 

diff --git a/src/scanner/media-scanner.c b/src/scanner/media-scanner.c
index faaca22..8200e18 100755 (executable)
--- a/src/scanner/media-scanner.c
+++ b/src/scanner/media-scanner.c
@@ -111,13 +111,9 @@ int main(int argc, char **argv)
        scan_thread = g_thread_new("scanner_thread", (GThreadFunc)msc_directory_scan_thread, NULL);
        register_thread = g_thread_new("register_thread", (GThreadFunc)msc_register_thread, NULL);
 
-       MS_DBG_INFO("scanner is ready");
-
+       MS_DBG_INFO("SCANNER is ready");
        msc_send_ready();
-
-       MS_DBG_WARN("*****************************************");
-       MS_DBG_WARN("*** Scanner is running ***");
-       MS_DBG_WARN("*****************************************");
+       MS_DBG_INFO("SCANNER is running");
 
        g_main_loop_run(scanner_mainloop);
 
@@ -139,7 +135,7 @@ int main(int argc, char **argv)
        __msc_remove_event_receiver();
 
 EXIT:
-       MS_DBG_INFO("SCANNER IS END");
+       MS_DBG_INFO("SCANNER is shutting down");
 
        return 0;
 }

diff --git a/src/server/media-server-db.c b/src/server/media-server-db.c
index 097e676..f42c92b 100755 (executable)
--- a/src/server/media-server-db.c
+++ b/src/server/media-server-db.c
@@ -97,16 +97,12 @@ gboolean ms_db_thread(void *data)
 
        g_main_context_push_thread_default(context);
 
-       MS_DBG("*******************************************");
-       MS_DBG("*** Media Server DB thread is running ***");
-       MS_DBG("*******************************************");
-
+       MS_DBG_INFO("Media Server DB thread is running");
        db_thread_ready = TRUE;
 
        g_main_loop_run(g_db_mainloop);
 
-       MS_DBG("*** Media Server DB thread will be closed ***");
-
+       MS_DBG_INFO("Media Server DB thread is shutting down");
        db_thread_ready = FALSE;
 
        g_io_channel_shutdown(channel, FALSE, NULL);

diff --git a/src/server/media-server-dcm.c b/src/server/media-server-dcm.c
index d371bc8..05c0507 100755 (executable)
--- a/src/server/media-server-dcm.c
+++ b/src/server/media-server-dcm.c
@@ -661,13 +661,9 @@ gpointer ms_dcm_agent_start_thread(gpointer data)
        g_source_set_callback(source, (GSourceFunc)_ms_dcm_agent_read_socket, NULL, NULL);
        g_source_attach(source, context);
 
-       MS_DBG("************************************");
-       MS_DBG("*** DCM Agent thread is running ***");
-       MS_DBG("************************************");
-
+       MS_DBG_INFO("DCM Agent thread is running");
        g_main_loop_run(g_dcm_agent_loop);
-
-       MS_DBG("DCM Agent thread is shutting down...");
+       MS_DBG_INFO("DCM Agent thread is shutting down");
 
        /*close an IO channel & remove resources */
        g_io_channel_shutdown(channel, FALSE, NULL);

diff --git a/src/server/media-server-main.c b/src/server/media-server-main.c
index 82c494b..fc42a9e 100755 (executable)
--- a/src/server/media-server-main.c
+++ b/src/server/media-server-main.c
@@ -430,13 +430,7 @@ int main(int argc, char **argv)
 #ifdef _USE_TVPD_MODE
        ms_check_size_mediadb(uid, &db_size);
        ms_get_remain_space(&free_space);
-       MS_DBG_WARN("==========================");
-       MS_DBG_WARN("DB SIZE : %lf", db_size);
-       MS_DBG_WARN("DB LIMIT1   : %lf", MEDIA_DB_SIZE_LIMIT_1);
-       MS_DBG_WARN("DB LIMIT2   : %lf", MEDIA_DB_SIZE_LIMIT_2);
-       MS_DBG_WARN("FREE SPACE  : %lf", free_space);
-       MS_DBG_WARN("SPACE LIMIT : %lf", MEDIA_DB_SPACE_LIMIT);
-       MS_DBG_WARN("==========================");
+       MS_DBG_WARN("DB SIZE[%lf] LIMIT1[%lf] LIMIT2[%lf] FREE SPACE[%lf] SPACE LIMIT[%lf]", db_size, MEDIA_DB_SIZE_LIMIT_1, MEDIA_DB_SIZE_LIMIT_2, free_space, MEDIA_DB_SPACE_LIMIT);
 
        if (db_size > MEDIA_DB_SIZE_LIMIT_2) {
                MS_DBG_ERR("THE SIZE OF MEDIA DB REACH THE LIMIT. RESET MEDIA DB.");
@@ -481,10 +475,7 @@ int main(int argc, char **argv)
        /*Active flush */
        malloc_trim(0);
 
-       MS_DBG_WARN("********************************");
-       MS_DBG_WARN("*** Media Server is running ***");
-       MS_DBG_WARN("********************************");
-
+       MS_DBG_INFO("Media Server is running");
        ms_write_media_server_status();
 
        if (!ms_config_set_int(MS_SERVER_STATUS, 1))
@@ -506,7 +497,7 @@ int main(int argc, char **argv)
 
        __ms_free_global_variable();
 
-       MS_DBG_WARN("*** Media Server is stopped ***");
+       MS_DBG_INFO("Media Server is shutting down");
 
        return 0;
 }

diff --git a/src/server/media-server-scanner.c b/src/server/media-server-scanner.c
index de1b24f..6449f39 100755 (executable)
--- a/src/server/media-server-scanner.c
+++ b/src/server/media-server-scanner.c
@@ -141,7 +141,7 @@ static gboolean _ms_stop_scanner(gpointer user_data)
                if (kill(child_pid, SIGKILL) < 0) {
                        MS_DBG_ERR("kill failed[%d]", child_pid);
                }
-               MS_DBG_WARN("KILL SCANNER");
+               MS_DBG_INFO("KILL SCANNER");
        } else {
                MS_DBG_ERR("SCANNER IS ALREADY DEAD");
        }
@@ -267,7 +267,7 @@ int ms_scanner_start(void)
                        GIOChannel *res_channel = NULL;
                        GMainContext *res_context = NULL;
 
-                       MS_DBG_WARN("[No-Error] SCANNER is ready");
+                       MS_DBG_INFO("SCANNER is ready");
 
                        scanner_ready = true;
                        scanner_cleaned = false;

diff --git a/src/server/media-server-thumb.c b/src/server/media-server-thumb.c
index 89a6bcb..33eb141 100755 (executable)
--- a/src/server/media-server-thumb.c
+++ b/src/server/media-server-thumb.c
@@ -753,13 +753,9 @@ gpointer ms_thumb_agent_start_thread(gpointer data)
        g_source_set_callback(source, (GSourceFunc)_ms_thumb_agent_read_socket, NULL, NULL);
        g_source_attach(source, context);
 
-       MS_DBG("************************************");
-       MS_DBG("*** Thumbnail Agent thread is running ***");
-       MS_DBG("************************************");
-
+       MS_DBG_INFO("Thumbnail Agent thread is running");
        g_main_loop_run(g_thumb_agent_loop);
-
-       MS_DBG("Thumbnail Agent thread is shutting down...");
+       MS_DBG_INFO("Thumbnail Agent thread is shutting down");
 
        /*close an IO channel*/
        g_io_channel_shutdown(channel, FALSE, NULL);