enable on-demand

Change-Id: Id4028255a48f39aeeead3d3e196921170090d3fb

diff --git a/client/ctsvc_client_noti.c b/client/ctsvc_client_noti.c
index 3121379..debbeaf 100644 (file)
--- a/client/ctsvc_client_noti.c
+++ b/client/ctsvc_client_noti.c
@@ -81,7 +81,8 @@ int _cnoti_recover_for_change_subscription()
        subscribe_info_s *info = NULL;
 
        for (it = __db_change_subscribe_list; it; it = it->next) {
-               if (NULL == it->data) continue;
+               if (NULL == it->data)
+                       continue;
 
                info = it->data;
                if (info->view_uri) {
@@ -139,7 +140,10 @@ int ctsvc_ipc_recover_for_change_subscription()
        }
 
        pims_ipc_destroy_for_subscribe(__ipc);
-       __ipc = pims_ipc_create_for_subscribe(CTSVC_IPC_SOCKET_PATH_FOR_CHANGE_SUBSCRIPTION);
+       char sock_file[CTSVC_PATH_MAX_LEN] = {0};
+       snprintf(sock_file, sizeof(sock_file), CTSVC_SOCK_PATH"/.%s_for_subscribe",
+                       getuid(), CTSVC_IPC_SERVICE);
+       __ipc = pims_ipc_create_for_subscribe(sock_file);
        if (NULL == __ipc) {
                ERR("pims_ipc_create_for_subscribe() Fail");
                ctsvc_mutex_unlock(CTS_MUTEX_PIMS_IPC_PUBSUB);

diff --git a/common/ipc/ctsvc_ipc_define.h b/common/ipc/ctsvc_ipc_define.h
index ab3f0df..fbabf21 100644 (file)
--- a/common/ipc/ctsvc_ipc_define.h
+++ b/common/ipc/ctsvc_ipc_define.h
@@ -20,9 +20,6 @@
 #define __CTSVC_IPC_DEFINE_H__
 
 #define CTSVC_IPC_SERVICE              "contacts_svc_ipc"
-#define CTSVC_IPC_SOCKET_PATH          "/tmp/."CTSVC_IPC_SERVICE
-
-#define CTSVC_IPC_SOCKET_PATH_FOR_CHANGE_SUBSCRIPTION    "/tmp/."CTSVC_IPC_SERVICE"_for_subscribe"
 #define CTSVC_IPC_SUBSCRIBE_MODULE               "ctsvc_ipc_subscribe_module"
 
 #define CTSVC_IPC_MODULE               "ctsvc_ipc_module"

diff --git a/packaging/contacts-service.service b/packaging/contacts-service.service
index 3e591e8..31fb27e 100644 (file)
--- a/packaging/contacts-service.service
+++ b/packaging/contacts-service.service
@@ -2,11 +2,6 @@
 Description=Start the Contacts service helper service
 
 [Service]
-Type=simple
-Environment="CMD=timeout" "TIME=0"
+Environment="CMD=timeout" "TIME=90"
 ExecStart=/usr/bin/contacts-service-ipcd $CMD $TIME
-Restart=always
-RestartSec=1
 
-[Install]
-WantedBy=default.target

diff --git a/packaging/contacts-service.spec b/packaging/contacts-service.spec
index fe25ff4..4473364 100644 (file)
--- a/packaging/contacts-service.spec
+++ b/packaging/contacts-service.spec
@@ -85,7 +85,6 @@ rm -rf %{buildroot}
 
 mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir_user}/contacts-service.service
-ln -s ../contacts-service.service %{buildroot}%{_unitdir_user}/default.target.wants/contacts-service.service
 
 mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
 install -m 0644 %SOURCE2 %{buildroot}%{_unitdir_user}/contacts-service.socket
@@ -103,7 +102,6 @@ chsmack -e "User" /usr/bin/contacts-service-test
 %{_libdir}/libcontacts-service2.so.*
 %{_bindir}/contacts-service-ipcd*
 %{_unitdir_user}/contacts-service.service
-%{_unitdir_user}/default.target.wants/contacts-service.service
 %{_unitdir_user}/sockets.target.wants/contacts-service.socket
 %{_unitdir_user}/contacts-service.socket
 %license LICENSE.APLv2

diff --git a/server/ctsvc_server.c b/server/ctsvc_server.c
index 4b3859d..ab79f6a 100644 (file)
--- a/server/ctsvc_server.c
+++ b/server/ctsvc_server.c
@@ -124,7 +124,6 @@ static int __server_main(void)
                        break;
                }
                ctsvc_set_client_access_info(NULL, NULL);
-
                ctsvc_server_bg_add_cb();
                ctsvc_server_bg_delete_start();
 
@@ -132,25 +131,17 @@ static int __server_main(void)
                DBG("%d", ret);
 
                main_loop = g_main_loop_new(NULL, FALSE);
-
                pims_ipc_svc_run_main_loop(main_loop);
 
                ctsvc_server_final_configuration();
-
                ctsvc_server_bg_remove_cb();
-
                ctsvc_unset_client_access_info();
-
-               ret = ctsvc_disconnect();
-               if (CONTACTS_ERROR_NONE != ret)
-                       DBG("%d", ret);
+               ctsvc_disconnect();
 
                pims_ipc_svc_deinit_for_publish();
-
                pims_ipc_svc_deinit();
 
                return 0;
-
        } while (0);
 
        ERR("pims_ipc_svc_register error");
@@ -169,19 +160,13 @@ int ctsvc_server_get_timeout_sec(void)
        return ctsvc_timeout_sec;
 }
 
-#define CTSVC_SECURITY_FILE_GROUP 6005
 void ctsvc_create_file_set_permission(const char *file, mode_t mode)
 {
        int fd, ret;
        fd = creat(file, mode);
        if (0 <= fd) {
-               ret = fchown(fd, -1, CTSVC_SECURITY_FILE_GROUP);
-               if (-1 == ret)
-                       ERR("fchown() Fail");
-
                close(fd);
        }
-
 }
 
 void ctsvc_create_rep_set_permission(const char *directory, mode_t mode)
@@ -248,8 +233,7 @@ int main(int argc, char *argv[])
        ctsvc_server_db_update();
 
        ctsvc_server_load_feature_list();
-       ret = ctsvc_server_socket_init();
-       DBG("%d", ret);
+       ctsvc_server_socket_init();
 
        __server_main();