Fix restore logic

[platform/core/uifw/stt.git] / client / stt_dbus.c

diff --git a/client/stt_dbus.c b/client/stt_dbus.c
index a143b71..f6ddbf0 100644 (file)
--- a/client/stt_dbus.c
+++ b/client/stt_dbus.c
@@ -615,6 +615,26 @@ static Eina_Bool listener_event_callback(void* data, Ecore_Fd_Handler *fd_handle
                        SLOG(LOG_DEBUG, TAG_STTC, " ");
                } /* STTD_METHOD_SPEECH_STATUS */
 
+               else if (dbus_message_is_signal(msg, "org.freedesktop.DBus", "NameOwnerChanged")) {
+                       SLOG(LOG_DEBUG, TAG_STTC, "===== Owner Changed");
+                       DBusError err;
+                       dbus_error_init(&err);
+
+                       /* remove a rule for daemon error */
+                       char rule_err[256] = {0, };
+                       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface);
+                       dbus_bus_remove_match(g_conn_listener, rule_err, &err);
+                       dbus_connection_flush(g_conn_listener);
+                       if (dbus_error_is_set(&err)) {
+                               SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message);
+                               dbus_error_free(&err);
+                       }
+
+                       __stt_cb_error(-1, STT_ERROR_SERVICE_RESET, "Daemon Reset");
+                       SLOG(LOG_DEBUG, TAG_STTC, "=====");
+                       SLOG(LOG_DEBUG, TAG_STTC, " ");
+               } /* NameOwnerChanged */
+
                else {
                        SLOG(LOG_DEBUG, TAG_STTC, "Message is NOT valid");
                        dbus_message_unref(msg);
@@ -823,7 +843,6 @@ int stt_dbus_request_hello(int uid)
                                        SLOG(LOG_ERROR, TAG_STTC, "[ERROR] Fail to allocate memory");
                                        return STT_ERROR_OUT_OF_MEMORY;
                                }
-                               SLOG(LOG_DEBUG, TAG_STTC, "[DBUS] service name: %s, object path: %s, interface: %s", g_server_service_name, g_server_service_object, g_server_service_interface);
 
                                msg = dbus_message_new_method_call(
                                        STT_SERVER_SERVICE_NAME,
@@ -869,12 +888,12 @@ int stt_dbus_request_hello(int uid)
        }
 
        if (NULL == msg) {
-               SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message");
-               return STT_ERROR_OPERATION_FAILED;
+//             SLOG(LOG_ERROR, TAG_STTC, ">>>> Request stt hello : Fail to make message");
+               result = stt_dbus_reconnect();
+               if (0 != result)
+                       return STT_ERROR_OPERATION_FAILED;
        }
 
-
-
        if (g_conn_sender) {
                result_msg = dbus_connection_send_with_reply_and_block(g_conn_sender, msg, g_waiting_short_time, &err);
                dbus_message_unref(msg);
@@ -897,11 +916,11 @@ int stt_dbus_request_hello(int uid)
                                dbus_error_free(&err);
                        }
 
-                       SLOG(LOG_ERROR, TAG_STTC, "STT_ERROR_TIME_OUT");
                        result = STT_ERROR_TIMED_OUT;
                }
        } else {
                SLOG(LOG_WARN, TAG_STTC, "[WARN] dbus connection handle is null (%p)", g_conn_sender);
+               stt_dbus_reconnect();
                result = STT_ERROR_OPERATION_FAILED;
        }
 
@@ -967,6 +986,18 @@ int stt_dbus_request_initialize(int uid, bool* silence_supported, bool* credenti
                        if (0 == result) {
                                SLOG(LOG_DEBUG, TAG_STTC, "<<<< stt initialize : result = %d, silence(%d), credential(%d)",
                                        result, *silence_supported, *credential_needed);
+
+                               /* add a rule for daemon error */
+                               char rule_err[256] = {0, };
+                               snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface);
+                               dbus_bus_add_match(g_conn_listener, rule_err, &err);
+                               dbus_connection_flush(g_conn_listener);
+
+                               if (dbus_error_is_set(&err)) {
+                                       SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message);
+                                       dbus_error_free(&err);
+                                       return STT_ERROR_OPERATION_FAILED;
+                               }
                        } else {
                                SLOG(LOG_ERROR, TAG_STTC, "<<<< stt initialize : result = %d", result);
                        }
@@ -989,6 +1020,19 @@ int stt_dbus_request_finalize(int uid)
 {
        DBusMessage* msg;
 
+       DBusError err;
+       dbus_error_init(&err);
+
+       /* remove a rule for daemon error */
+       char rule_err[256] = {0, };
+       snprintf(rule_err, 256, "sender='org.freedesktop.DBus',path='/org/freedesktop/DBus',interface='org.freedesktop.DBus',member='NameOwnerChanged',type='signal',arg0='%s'", g_server_service_interface);
+       dbus_bus_remove_match(g_conn_listener, rule_err, &err);
+       dbus_connection_flush(g_conn_listener);
+       if (dbus_error_is_set(&err)) {
+               SLOG(LOG_ERROR, TAG_STTC, "Match Error (%s)", err.message);
+               dbus_error_free(&err);
+       }
+
        SLOG(LOG_DEBUG, TAG_STTC, "[dbus_info] service name: %s, service object: %s, service interface: %s", g_server_service_name, g_server_service_object, g_server_service_interface);
 
        msg = dbus_message_new_method_call(
@@ -1006,9 +1050,6 @@ int stt_dbus_request_finalize(int uid)
 
        dbus_message_append_args(msg, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID);
 
-       DBusError err;
-       dbus_error_init(&err);
-
        DBusMessage* result_msg;
        int result = STT_ERROR_OPERATION_FAILED;