Add time out to JobWatch

Change-Id: Idfac8fcb7bf1e5da993a5382bf68e2a392f052e3
Signed-off-by: seolheui, kim <s414.kim@samsung.com>

diff --git a/server/internal-encryption.cpp b/server/internal-encryption.cpp
index b762cc2..9c13f3d 100644 (file)
--- a/server/internal-encryption.cpp
+++ b/server/internal-encryption.cpp
@@ -53,9 +53,6 @@ namespace ode {
 namespace {
 
 const char *PRIVILEGE_PLATFORM = "http://tizen.org/privilege/internal/default/platform";
-const std::vector<std::string> blackListSystemdUnits = {
-       "samsung-log-mgr.service",
-};
 
 // watches systemd jobs
 class JobWatch {
@@ -105,7 +102,19 @@ JobWatch::~JobWatch() {
 bool JobWatch::waitForJob(const std::string& job) {
        while(true) {
                std::unique_lock<std::mutex> lock(jobsMutex);
-               jobsCv.wait(lock, [this]{ return !removedJobs.empty(); });
+               bool timeout = true;
+               auto sec = std::chrono::seconds(1);
+               jobsCv.wait_for(lock, 5*sec, [this, &timeout]{
+                               if (!removedJobs.empty()) {
+                                       timeout = false;
+                                       return true;
+                               }
+                               return false;});
+
+               if (timeout) {
+                       INFO(SINK, "job: " + job + ", result: time out");
+                       return false;
+               }
 
                while(!removedJobs.empty()) {
                        bool match = (removedJobs.front().job == job);
@@ -182,10 +191,6 @@ void stopSystemdUnits()
                }
        }
 
-       for (auto unit : blackListSystemdUnits) {
-               unitsToStop.erase(unitsToStop.find(unit));
-       }
-
        auto stopUnit = [&systemDBus](const std::string &unit) {
                INFO(SINK, "Stopping unit: " + unit);
                JobWatch watch(systemDBus);