Revert "sdb: Use systemd startup notification"

This reverts commit 5c0ef2844b81a5855f0828195c3d90f883d14dc6.

Change-Id: I9cf43c66bcd3bfbe1d50c9df14f8de4a67e55a0a

diff --git a/packaging/sdbd.service b/packaging/sdbd.service
index 0086137..e9b1047 100644 (file)
--- a/packaging/sdbd.service
+++ b/packaging/sdbd.service
@@ -9,7 +9,7 @@ SmackProcessLabel=System
 EnvironmentFile=-/run/sdbd-env
 #If necessary, Put Environment variable settings in a file like below
 #ExecStartPre=/bin/bash -c "/bin/echo 'SDB_TRACE=all SDBD_LOG_PATH=/tmp' >> /tmp/.sdbdlog.conf"
-Type=notify
+Type=simple
 Capabilities=cap_dac_override,cap_setgid,cap_setuid,cap_sys_admin=i
 SecureBits=keep-caps
 PIDFile=/tmp/.sdbd.pid

diff --git a/src/sdb.c b/src/sdb.c
index c014f34..fe77333 100644 (file)
--- a/src/sdb.c
+++ b/src/sdb.c
@@ -42,7 +42,6 @@
 #include "sdktools.h"
 #include "plugin.h"
 #include "sdbd_plugin.h"
-#include "sdb_systemd.h"
 
 #ifdef SUPPORT_ENCRYPT
 #include "plugin_encrypt.h"
@@ -2128,8 +2127,6 @@ int sdb_main(int server_port)
     D("sdb_main(): post init_jdwp()\n");
 #endif
 
-    sdb_notify_startup(0, "READY=1");
-
     D("Event loop starting\n");
 
     fdevent_loop();
@@ -2274,3 +2271,4 @@ int main(int argc, char **argv)
     signal(SIGTERM, handle_sig_term); /* tizen specific */
     return sdb_main(DEFAULT_SDB_PORT);
 }
+

diff --git a/src/sdb_systemd.h b/src/sdb_systemd.h
index f9aeb18..f183389 100644 (file)
--- a/src/sdb_systemd.h
+++ b/src/sdb_systemd.h
@@ -7,10 +7,6 @@
 #include <arpa/inet.h>
 #include "sysdeps.h"
 
-static __inline__ void sdb_notify_startup(int unset_env, const char *state)
-{
-     sd_notify(unset_env, state);
-}
 
 static int sdb_port_get_tcp_listenfd(void)
 {
@@ -35,8 +31,6 @@ static __inline__ int sdb_port_try_automatic(void)
 
 #else
 
-static __inline__ void sdb_notify_startup(int unset_env, const char *state) { }
-
 static __inline__ int sdb_port_get_tcp_listenfd(void)
 {
      return -1;