Fix AUL_DAEMON path existence issue

- Create AUL and AUL_DAEMONS Path when amd launched
- Change amd to open socket when it fail to create fake amd_sock.

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

diff --git a/src/lib/amd_main.cc b/src/lib/amd_main.cc
index 0fd736dc1f3de6104ffc3829a880db71270cc35c..5088b5dca0b4f6f7a4102b7c4ed1288fc2013937 100644 (file)
--- a/src/lib/amd_main.cc
+++ b/src/lib/amd_main.cc
@@ -72,7 +72,9 @@ namespace {
 
 constexpr const char PATH_AMD_MOD[] = "/usr/share/amd/mod";
 constexpr const char PATH_AMD_READY[] = "/run/.amd_ready";
+constexpr const char PATH_AUL[] = "/run/aul";
 constexpr const char PATH_AUL_APPS[] = "/run/aul/apps";
+constexpr const char PATH_AUL_DAEMONS[] = "/run/aul/daemons";
 constexpr const char PATH_AUL_DBSPACE[] = "/run/aul/dbspace";
 constexpr const char PATH_AUL_LOG[] = "/run/aul/log";
 constexpr const char PATH_AUL_RPCPORT[] = "/run/aul/rpcport";
@@ -222,7 +224,9 @@ void CheckAndCreateDirectory(const char* path) {
 }
 
 void CreateAulDirectories() {
+  CheckAndCreateDirectory(PATH_AUL);
   CheckAndCreateDirectory(PATH_AUL_APPS);
+  CheckAndCreateDirectory(PATH_AUL_DAEMONS);
   CheckAndCreateDirectory(PATH_AUL_DBSPACE);
   CheckAndCreateDirectory(PATH_AUL_LOG);
   CheckAndCreateDirectory(PATH_AUL_RPCPORT);

diff --git a/src/lib/request/request_manager.cc b/src/lib/request/request_manager.cc
index 9e5c92f79817694fba82f7a3e131b6163b21eedc..60d0e0a02645347cf940e518dd8c293d22e754f7 100644 (file)
--- a/src/lib/request/request_manager.cc
+++ b/src/lib/request/request_manager.cc
@@ -566,12 +566,10 @@ bool RequestManager::Init() {
   // TODO(Abstract Socket Issue): file-based socket check
   marker = open(kAmdSockReady, O_RDWR | O_CREAT,
       S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
-  if(marker < 0) {
-    _E("Fail to create ready file (%s)", kAmdSockReady);
-    Fini();
-    return false;
-  }
-  close(marker);
+  if(marker < 0)
+    _E("Fail to create ready file (%d:%s)", errno, kAmdSockReady);
+  else
+    close(marker);
 
   amd_io_ = g_io_channel_unix_new(amd_fd_);
   if (amd_io_ == nullptr) {