Fix file name issue on checking launchpad socket

- Previous patch change filename which shows launchpad socket is ready
- This patch fix aul apis to access via new filename
- Change variable names to distinguish socket ready file and socket itself

Change-Id: Ic8e3bb7395189ee4f58e1efa5781dcbfef692d7c
Signed-off-by: Jihoi Kim <jihoi.kim@samsung.com>

diff --git a/src/lib/amd_login_monitor.c b/src/lib/amd_login_monitor.c
index 181325960855d589ad775eee57627e56088023bd..9cc8368e77cbe1113e84fae71199d67d86ae157d 100644 (file)
--- a/src/lib/amd_login_monitor.c
+++ b/src/lib/amd_login_monitor.c
@@ -46,6 +46,7 @@
 #include "amd_util.h"
 
 #define PATH_AUL_DAEMONS "/run/aul/daemons"
+#define LAUNCHPAD_PROCESS_POOL_SOCK_READY ".launchpad-process-pool-sock"
 #define LOGIN_TIMEOUT_SEC 90
 #define FILE_SYSTEMD "systemd"
 #define FILE_USERS "users"
@@ -553,7 +554,7 @@ static void __send_ping_to_launchpad(uid_t uid)
 
        //TODO(Abstract Socket Issue): replace file-based setup check
        snprintf(path, sizeof(path), "%s/%d/%s",
-                       PATH_AUL_DAEMONS, uid, LAUNCHPAD_PROCESS_POOL_SOCK);
+                       PATH_AUL_DAEMONS, uid, LAUNCHPAD_PROCESS_POOL_SOCK_READY);
        if (access(path, F_OK) != 0) {
                _D("%s doesn't exist", path);
                return;

diff --git a/src/lib/launchpad/launchpad.cc b/src/lib/launchpad/launchpad.cc
index 3a6f5e873c86152cef10917a8b664091d5185015..9ccc9ce2e5123e43403f87b0cc4a99b3a011c2c4 100644 (file)
--- a/src/lib/launchpad/launchpad.cc
+++ b/src/lib/launchpad/launchpad.cc
@@ -44,7 +44,7 @@ constexpr const char AUL_DBUS_PATH[] = "/aul/dbus_handler";
 constexpr const char AUL_DBUS_SIGNAL_INTERFACE[] = "org.tizen.aul.signal";
 constexpr const char AUL_DBUS_APPDEAD_SIGNAL[] = "app_dead";
 constexpr const char AUL_DBUS_APPLAUNCH_SIGNAL[] = "app_launch";
-constexpr const char kLaunchpadProcessPoolSock[] =
+constexpr const char LAUNCHPAD_PROCESS_POOL_SOCK_READY[] =
     ".launchpad-process-pool-sock";
 
 class GarbageCollector : public Worker::Job {
@@ -273,9 +273,9 @@ int Launchpad::SendAndReceive(int cmd, bundle* request, uid_t uid) {
 }
 
 bool Launchpad::ListenSigchld() {
-  std::string path = GetEndpoint(uid_, kLaunchpadProcessPoolSock);
-  if (access(path.c_str(), F_OK) != 0) {
-    _W("%s doesn't exist", path.c_str());
+  std::string sock_ready = GetEndpoint(uid_, LAUNCHPAD_PROCESS_POOL_SOCK_READY);
+  if (access(sock_ready.c_str(), F_OK) != 0) {
+    _W("%s doesn't exist", sock_ready.c_str());
     return false;
   }
 

diff --git a/src/lib/request/request_manager.cc b/src/lib/request/request_manager.cc
index 73df245ec9db8dd9eb85611405f76078f4b4e740..78649ff6037c6cad401ea783e70e92b15d844fe3 100644 (file)
--- a/src/lib/request/request_manager.cc
+++ b/src/lib/request/request_manager.cc
@@ -547,6 +547,7 @@ gboolean RequestManager::RequestHandler(GIOChannel* io,
 }
 
 bool RequestManager::Init() {
+  constexpr const char kAmdSockReady[] = "/run/aul/daemons/.amd-sock";
   int marker;
 
   amd_fd_ = _create_sock_activation();
@@ -561,7 +562,7 @@ bool RequestManager::Init() {
   }
 
   // TODO(Abstract Socket Issue): file-based socket check
-  marker = open("/run/aul/daemons/.amd-sock", O_RDWR | O_CREAT,
+  marker = open(kAmdSockReady, O_RDWR | O_CREAT,
       S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
   close(marker);