Change some logs 99/223099/4
authorInkyun Kil <inkyun.kil@samsung.com>
Thu, 23 Jan 2020 01:04:40 +0000 (10:04 +0900)
committerInkyun Kil <inkyun.kil@samsung.com>
Wed, 29 Jan 2020 09:18:36 +0000 (18:18 +0900)
Change-Id: I0e691bdae6e50a2c420af77321acd94c1ab04e1c
Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
server/alarm-manager-dbus.c
server/alarm-manager-util.c
server/alarm-manager.c

index c158337ca8d836eb985986882fc2401c78add249..927ae04713941405833f3e4eb202b4c0ea0fb7be 100644 (file)
@@ -342,7 +342,14 @@ static void __alarm_send_noti_to_application_reply(
        conn = G_DBUS_CONNECTION(source_object);
        message = g_dbus_connection_call_finish(conn, res, &error);
 
-       if (error != NULL && error->code == G_DBUS_ERROR_SERVICE_UNKNOWN) {
+       if (error == NULL) {
+               g_variant_unref(message);
+               free(reply_alarm_id);
+               return;
+       }
+
+       LOGE("g_dbus_connection_call_finish Error[%d] : [%s] ", error->code, error->message);
+       if (error->code == G_DBUS_ERROR_SERVICE_UNKNOWN) {
                for (gs_iter = alarm_context.alarms; gs_iter != NULL; gs_iter = g_slist_next(gs_iter) ) {
                        entry = gs_iter->data;
 
@@ -360,8 +367,7 @@ static void __alarm_send_noti_to_application_reply(
                        }
                }
 
-
-               LOGW("failed to send alarm expired noti [%d: %s] [id : %d, %s -> %s]",
+               LOGE("failed to send alarm expired noti [%d: %s] [id : %d, %s -> %s]",
                                error->code, error->message, *reply_alarm_id,
                                app_unique_name, service_name);
 
@@ -398,12 +404,9 @@ static void __alarm_send_noti_to_application_reply(
                        _alarm_schedule();
                        _rtc_set();
                }
-       } else {
-               g_variant_unref(message);
        }
 
        free(reply_alarm_id);
-
 }
 
 void _alarm_send_noti_to_application_by_dbus(const char *app_service_name,
index 86d274a53e2bdd51812e6f561e03c74c8ee0aa88..1486adbb26976f2df6c06317c95a5f981138af9e 100644 (file)
@@ -528,7 +528,7 @@ void _save_module_log(const char *tag, const char *message)
 
        snprintf(buffer, ALARMMGR_LOG_BUFFER_STRING_SIZE, "[%-6d]%s\t%s\t : %ld %s\n", log_index, tag, message, now, time_str);
 
-       SECURE_LOGW("%s", buffer);
+       LOGW("%s", buffer);
        int ret = write(log_fd, buffer, strlen(buffer));
        if (ret < 0) {
                LOGE("Writing the alarmmgr log is failed. err: %s", strerror_r(errno, buf, sizeof(buf)));
index 0717b50b98f97dd7680e89be37e4a7a50e04ba31..ddc5db345f2572e501d03de92d425985f78fcf06 100644 (file)
@@ -734,7 +734,7 @@ static bool __alarm_add_and_set(__alarm_info_t *alarm_info, pid_t pid)
 
        time(&current_time);
 
-       SECURE_LOGW("[alarm-server]:pid=%d, app_unique_name=%s, \
+       LOGW("[alarm-server]:pid=%d, app_unique_name=%s, \
                        app_service_name=%s,dst_service_name=%s, c_due_time=%ld",
                        pid, alarm_info->app_unique_name,
                        alarm_info->app_service_name,