Fix bugs

[platform/core/uifw/tts.git] / server / ttsd_main_sr.c

diff --git a/server/ttsd_main_sr.c b/server/ttsd_main_sr.c
old mode 100755 (executable)
new mode 100644 (file)
index 0add23d..97e2461
--- a/server/ttsd_main_sr.c
+++ b/server/ttsd_main_sr.c
@@ -1,5 +1,5 @@
 /*
-*  Copyright (c) 2012, 2013 Samsung Electronics Co., Ltd All Rights Reserved 
+*  Copyright (c) 2011-2016 Samsung Electronics Co., Ltd All Rights Reserved 
 *  Licensed under the Apache License, Version 2.0 (the "License");
 *  you may not use this file except in compliance with the License.
 *  You may obtain a copy of the License at
@@ -20,7 +20,14 @@
 
 #define CLIENT_CLEAN_UP_TIME 500
 
-char* get_tag()
+static Ecore_Timer* g_check_client_timer = NULL;
+
+const char* get_tag()
+{
+       return "ttsdsr";
+}
+
+const char* tts_tag()
 {
        return "ttsdsr";
 }
@@ -36,45 +43,48 @@ int main()
        SLOG(LOG_DEBUG, get_tag(), "  ");
        SLOG(LOG_DEBUG, get_tag(), "  ");
        SLOG(LOG_DEBUG, get_tag(), "===== TTS DAEMON SR INITIALIZE");
+
        if (!ecore_init()) {
-               SLOG(LOG_ERROR, get_tag(), "[Main ERROR] fail ecore_init()");
+               SLOG(LOG_ERROR, get_tag(), "[Main ERROR] Fail ecore_init()");
                return -1;
        }
 
-       if (0 != ttsd_initialize()) {
-               printf("Fail to initialize tts-daemon-sr \n");
-               SLOG(LOG_ERROR, get_tag(), "[Main ERROR] fail to initialize tts-daemon-sr"); 
+       if (0 != ttsd_dbus_open_connection()) {
+               SLOG(LOG_ERROR, get_tag(), "[Main ERROR] Fail to open dbus connection");
                return EXIT_FAILURE;
        }
-       
-       if (0 != ttsd_dbus_open_connection()) {
-               printf("Fail to initialize IPC connection \n");
-               SLOG(LOG_ERROR, get_tag(), "[Main ERROR] fail to open dbus connection");
+
+       if (0 != ttsd_initialize()) {
+               SLOG(LOG_ERROR, get_tag(), "[Main ERROR] Fail to initialize tts-daemon-sr"); 
                return EXIT_FAILURE;
        }
 
        if (0 != ttsd_network_initialize()) {
-               SLOG(LOG_ERROR, get_tag(), "[Main ERROR] fail to initialize network \n");
-               return EXIT_FAILURE;
+               SLOG(LOG_WARN, get_tag(), "[Main WARNING] Fail to initialize network");
        }
 
-       ecore_timer_add(CLIENT_CLEAN_UP_TIME, ttsd_cleanup_client, NULL);
+       g_check_client_timer = ecore_timer_add(CLIENT_CLEAN_UP_TIME, ttsd_cleanup_client, NULL);
+       if (NULL == g_check_client_timer) {
+               SLOG(LOG_WARN, get_tag(), "[Main Warning] Fail to create timer of client check");
+       }
 
-       SLOG(LOG_DEBUG, get_tag(), "[Main] tts-daemon-sr start...\n"); 
+       SLOG(LOG_DEBUG, get_tag(), "[Main] tts-daemon-sr start..."); 
        SLOG(LOG_DEBUG, get_tag(), "=====");
        SLOG(LOG_DEBUG, get_tag(), "  ");
        SLOG(LOG_DEBUG, get_tag(), "  ");
-
-       printf("Start tts-daemon-sr...\n");
        
        ecore_main_loop_begin();
 
        SLOG(LOG_DEBUG, get_tag(), "===== TTS DAEMON SR FINALIZE");
 
-       ttsd_network_finalize();
+       if (NULL != g_check_client_timer) {
+               ecore_timer_del(g_check_client_timer);
+       }
 
        ttsd_dbus_close_connection();
 
+       ttsd_network_finalize();
+
        ttsd_finalize();
 
        ecore_shutdown();