Update ncsambawatcher.service

configs/ncsambawatcher.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=A service which scan Nextcloud folders
-After=network.target
+After=network.target docker.service
+Requires=docker.service
 
 [Service]
 ExecStart=/usr/bin/ncsambawatcher

src/main.cpp

@@ -1,7 +1,10 @@
 #include <stdio.h>
+#include <unistd.h>
+#include <sys/wait.h>
 #include <iostream>
 #include <thread>
 #include <vector>
+#include <set>
 #include <array>
 #include <string>
 #include <mutex>
@@ -45,18 +48,45 @@ void readingThreadFunc()
 void scannerThreadFunc()
 {
     std::unique_lock<std::mutex> lock(mtx);
+    std::vector<pid_t> childrens;
     while (true)
     {
         cv.wait(lock, []
-                { return manager.isAnybodyInQueue(); });
+                { return manager.isAnybodyFlagged(); });
 
-        std::vector<std::string> scanUsers = manager.getFlaggedUsers();
+        std::set<std::string> scanUsers = manager.getFlaggedUsers();
         manager.unflagAllUsers();
 
-        for (std::vector<std::string>::iterator it = scanUsers.begin(); it != scanUsers.end(); it++)
+        lock.unlock();
+        childrens.clear();
+
+        for (const std::string& user : scanUsers)
         {
-            system((std::string(SCAN_CMD_USR) + *it).c_str());
+            pid_t child = fork();
+
+            if (child < 0)
+            {
+                std::cerr << "Fork failed for: " << user << std::endl;
+            }
+            else if (child == 0) // child
+            {
+                std::string cmd = (std::string(SCAN_CMD_USR) + user);
+                execl("/bin/sh", "sh", "-c", cmd.c_str(), static_cast<char *>(nullptr));
+                std::cerr << "Scan failed" << std::endl;
+                _exit(EXIT_FAILURE);
+            }
+            else // parent
+            {
+                childrens.push_back(child);
+            }
         }
+
+        for (const pid_t& pid : childrens)
+        {
+            waitpid(pid, nullptr, 0);
+        }
+
+        lock.lock();
     }
 }
 

src/usermanager.h

@@ -4,6 +4,7 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <set>
 #include <sstream>
 #include <mutex>
 #include "locations.h"
@@ -71,23 +72,23 @@ public:
         }
     }
 
-    std::vector<std::string> getUsers()
+    std::set<std::string> getUsers()
     {
-        std::vector<std::string> ret;
+        std::set<std::string> ret;
 
         std::lock_guard<std::mutex> lock(mtx);
 
         for (std::map<std::string, bool>::iterator it = users.begin(); it != users.end(); ++it)
         {
-            ret.push_back(it->first);
+            ret.insert(it->first);
         }
 
         return ret;
     }
 
-    std::vector<std::string> getFlaggedUsers()
+    std::set<std::string> getFlaggedUsers()
     {
-        std::vector<std::string> ret;
+        std::set<std::string> ret;
 
         std::lock_guard<std::mutex> lock(mtx);
 
@@ -95,14 +96,14 @@ public:
         {
             if (it->second)
             {
-                ret.push_back(it->first);
+                ret.insert(it->first);
             }
         }
 
         return ret;
     }
 
-    bool isAnybodyInQueue()
+    bool isAnybodyFlagged()
     {
         std::lock_guard<std::mutex> lock(mtx);