From 39ba85ec55b2de81bb872bacb035f6731e56086e Mon Sep 17 00:00:00 2001 From: DoHyun Pyun Date: Tue, 3 Dec 2019 10:47:19 +0900 Subject: [PATCH 1/1] Calls sd_notify(STOPPING=1) to ensure systemd's operation Change-Id: Ifdea8bd44796f7581c783c97243f9aa03046ca8f Signed-off-by: DoHyun Pyun --- bt-service-adaptation/CMakeLists.txt | 1 + bt-service-adaptation/services/bt-request-handler.c | 3 +++ packaging/bluetooth-frwk-common.service | 3 ++- packaging/bluetooth-frwk-mobile-sprd.service | 1 + packaging/bluetooth-frwk-mobile.service | 1 + packaging/bluetooth-frwk-tv.service | 1 + packaging/bluetooth-frwk-wearable.service | 1 + packaging/bluetooth-frwk.spec | 1 + 8 files changed, 11 insertions(+), 1 deletion(-) diff --git a/bt-service-adaptation/CMakeLists.txt b/bt-service-adaptation/CMakeLists.txt index 699b7d8..d3477fd 100644 --- a/bt-service-adaptation/CMakeLists.txt +++ b/bt-service-adaptation/CMakeLists.txt @@ -86,6 +86,7 @@ SET(PKG_MODULES eventsystem storage capi-system-info + libsystemd-daemon ) INCLUDE(FindPkgConfig) diff --git a/bt-service-adaptation/services/bt-request-handler.c b/bt-service-adaptation/services/bt-request-handler.c index 87f79bb..d1d1203 100644 --- a/bt-service-adaptation/services/bt-request-handler.c +++ b/bt-service-adaptation/services/bt-request-handler.c @@ -23,6 +23,7 @@ #include #include #include +#include #include "bluetooth-api.h" #include "bluetooth-audio-api.h" @@ -4309,6 +4310,8 @@ fail: void _bt_service_unregister(void) { if (bt_service_conn) { + sd_notify(0, "STOPPING=1"); + if (owner_sig_id > 0) { g_dbus_connection_signal_unsubscribe( bt_service_conn, owner_sig_id); diff --git a/packaging/bluetooth-frwk-common.service b/packaging/bluetooth-frwk-common.service index 4a8808c..9d15b36 100644 --- a/packaging/bluetooth-frwk-common.service +++ b/packaging/bluetooth-frwk-common.service @@ -11,6 +11,7 @@ ExecStart=/usr/bin/bt-service Restart=on-failure RestartSec=1 KillMode=process +NotifyAccess=main [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target diff --git a/packaging/bluetooth-frwk-mobile-sprd.service b/packaging/bluetooth-frwk-mobile-sprd.service index fe84c39..6113d1d 100644 --- a/packaging/bluetooth-frwk-mobile-sprd.service +++ b/packaging/bluetooth-frwk-mobile-sprd.service @@ -12,6 +12,7 @@ BusName=org.projectx.bt ExecStartPre=/bin/sleep 2 ExecStart=/usr/bin/bt-service KillMode=process +NotifyAccess=main [Install] WantedBy=multi-user.target diff --git a/packaging/bluetooth-frwk-mobile.service b/packaging/bluetooth-frwk-mobile.service index 5127971..092e58b 100644 --- a/packaging/bluetooth-frwk-mobile.service +++ b/packaging/bluetooth-frwk-mobile.service @@ -10,6 +10,7 @@ Type=dbus BusName=org.projectx.bt ExecStart=/usr/bin/bt-service KillMode=process +NotifyAccess=main [Install] WantedBy=multi-user.target diff --git a/packaging/bluetooth-frwk-tv.service b/packaging/bluetooth-frwk-tv.service index 5f09436..461eb91 100644 --- a/packaging/bluetooth-frwk-tv.service +++ b/packaging/bluetooth-frwk-tv.service @@ -11,6 +11,7 @@ Type=dbus BusName=org.projectx.bt ExecStart=/usr/bin/bt-service KillMode=process +NotifyAccess=main [Install] WantedBy=multi-user.target diff --git a/packaging/bluetooth-frwk-wearable.service b/packaging/bluetooth-frwk-wearable.service index 5127971..092e58b 100644 --- a/packaging/bluetooth-frwk-wearable.service +++ b/packaging/bluetooth-frwk-wearable.service @@ -10,6 +10,7 @@ Type=dbus BusName=org.projectx.bt ExecStart=/usr/bin/bt-service KillMode=process +NotifyAccess=main [Install] WantedBy=multi-user.target diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec index 7a5f275..68bde80 100644 --- a/packaging/bluetooth-frwk.spec +++ b/packaging/bluetooth-frwk.spec @@ -43,6 +43,7 @@ BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(capi-appfw-app-control) BuildRequires: pkgconfig(gmock) BuildRequires: pkgconfig(libactd) +BuildRequires: pkgconfig(libsystemd-daemon) Requires(post): /usr/bin/vconftool Requires(post): /sbin/ldconfig -- 2.7.4