Modify log level for restart widget 23/200523/5
authorhyunho <hhstark.kang@samsung.com>
Tue, 26 Feb 2019 07:05:21 +0000 (16:05 +0900)
committerHwanKyu Jhun <h.jhun@samsung.com>
Mon, 4 Mar 2019 07:54:33 +0000 (07:54 +0000)
Change-Id: Iff52de6b6d2942285253eb663d47281900f1251d
Signed-off-by: hyunho <hhstark.kang@samsung.com>
widget_viewer_evas/src/widget_viewer_evas.c

index f79fa5d177b8c5f6a9de29e9aec3a101bcd1882a..78cd1e3cb2f2c80038078451558808f34daa2a9a 100644 (file)
@@ -752,15 +752,20 @@ static int __restart_terminated_widget(const char *widget_id)
        g_hash_table_iter_init(&iter, s_info.widget_table);
        while (g_hash_table_iter_next(&iter, &key, &value)) {
                widget_instance_info = (struct widget_info *)value;
-               if (widget_instance_info->restart &&
-                               (strcmp(widget_instance_info->widget_id, widget_id) == 0)) {
-                       target_pid = widget_instance_info->pid;
-                       break;
+               if (strcmp(widget_instance_info->widget_id, widget_id) == 0) {
+                       if (widget_instance_info->restart) {
+                               target_pid = widget_instance_info->pid;
+                               LOGW("Prepare restart (%s)(%d)", widget_id, target_pid);
+                               break;
+                       } else {
+                               LOGW("There is no restart event for (%s)",
+                                               widget_instance_info->instance_id);
+                       }
                }
        }
 
        if (target_pid == 0) {
-               LOGD("can not find widget(%s)", widget_id);
+               LOGW("can not find widget(%s)", widget_id);
                return 0;
        }
 
@@ -801,6 +806,7 @@ static gboolean __launch_timeout_cb(gpointer user_data)
                info->no_response_count++;
                LOGW("Widget is not responding(%d) !! %s(%d)",
                                info->no_response_count, instance_id, info->pid);
+
                aul_terminate_pid(info->pid);
        }
        __launch_instance();
@@ -836,7 +842,7 @@ static int __handle_restart_widget_request(const char *widget_id)
                        widget_instance_info->restart = true;
        }
        aul_terminate_pid_async(target_pid);
-       LOGD("Widget __handle_restart_widget_request id : %s, pid : %d",
+       LOGW("Widget __handle_restart_widget_request id : %s, pid : %d",
                        widget_id, target_pid);
        aul_widget_write_log(LOG_TAG, "[%s:%d]  %s, targetpid : %d",
                        __FUNCTION__, __LINE__, widget_id, target_pid);
@@ -1102,7 +1108,8 @@ API int widget_viewer_evas_notify_resumed_status_of_viewer(void)
 
                                tbm_obj = elm_object_part_content_get(info->layout, "tbm,widget");
                                if (!tbm_obj) {
-                                       LOGE("widget(%s) object is invalid", info->instance_id);
+                                       LOGE("widget(%s)(%d) object is invalid",
+                                                       info->instance_id, info->pid);
                                        continue;
                                }
 
@@ -1153,8 +1160,8 @@ API int widget_viewer_evas_notify_paused_status_of_viewer(void)
                        if (info->is_created) {
                                ret = __instance_pause(info);
                                if (ret < 0) {
-                                       LOGE("Fail to pause the widget(%s):(%d)",
-                                                       info->instance_id, ret);
+                                       LOGE("Fail to pause the widget(%s)(%d):(%d)",
+                                                       info->instance_id, info->pid, ret);
                                }
                        } else {
                                item = __create_pending_item("pause", 0, 0);
@@ -1321,14 +1328,14 @@ static void __move_cb(void *data, Evas *e, Evas_Object *layout, void *event_info
 {
        struct widget_info *info = data;
 
-       if (__obj_is_visible(layout)) {
-               if (info->pid < 0) {
-                       info->restart = true;
-                       LOGD("restart! %s", info->widget_id);
-                       __display_loading_text(info);
-                       __restart_terminated_widget(info->widget_id);
-               }
-       }
+       if (!__obj_is_visible(layout) || info->pid > 0)
+               return;
+
+       info->restart = true;
+       LOGW("restart! %s", info->instance_id);
+       __display_loading_text(info);
+       __restart_terminated_widget(info->widget_id);
+
 }
 /* LCOV_EXCL_STOP */