Remove running notification db upgrade script when from service

- upgrade db in code

Change-Id: I8e476e89fe14385f50ad1bdecaac342d90a49a41
Signed-off-by: SukhyungKang <shine.kang@samsung.com>

diff --git a/packaging/data-provider-master.service b/packaging/data-provider-master.service
index a2f5cf46f8c3a27bf4942e7c5d857989c1ea1909..ded09bb76f3a37735a580cc581e29f309814384d 100644 (file)
--- a/packaging/data-provider-master.service
+++ b/packaging/data-provider-master.service
@@ -13,7 +13,6 @@ SmackProcessLabel=System
 Capabilities=cap_dac_override=i
 SecureBits=keep-caps
 Environment=AUL_BLINK=1
-ExecStartPre=/usr/bin/bash -c 'LD_PRELOAD=libaul-blink.so.0 /etc/notification/upgrade.sh'
 ExecStart=/usr/bin/data-provider-master
 TimeoutStopSec=3s
 Restart=on-failure

diff --git a/src/notification_service.c b/src/notification_service.c
index 0e00aa1ea8605239ad046eb0d4d18fcca47c3e7b..3c809e249443b38305aabe823ceb81e9e248b861 100644 (file)
--- a/src/notification_service.c
+++ b/src/notification_service.c
@@ -2855,6 +2855,12 @@ HAPI int notification_service_init(int restart_count)
                return ret;
        }
 
+       ret = notification_upgrade_db();
+       if (ret != NOTIFICATION_ERROR_NONE) {
+               ERR("Failed to upgrade DB [%d]", ret);
+               return ret;
+       }
+
        ret = notification_register_dbus_interface();
        if (ret != SERVICE_COMMON_ERROR_NONE) {
                ERR("Failed to register dbus interface [%d]", ret);