X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..98ffbef6ea7a0944fd4aca27e3343b8ac5bc12f0:/projects/rscriptd/main.cpp?ds=sidebyside

diff --git a/projects/rscriptd/main.cpp b/projects/rscriptd/main.cpp
index 4c53c2c7..8cf9384d 100644
--- a/projects/rscriptd/main.cpp
+++ b/projects/rscriptd/main.cpp
@@ -34,16 +34,17 @@
 #include <unistd.h>
 
 #include <cstdlib>
+#include <cstdio>
 #include <csignal>
 #include <set>
 
-#include "common.h"
-#include "stg_logger.h"
-#include "script_executer.h"
-#include "conffiles.h"
+#include "stg/common.h"
+#include "stg/logger.h"
+#include "stg/scriptexecuter.h"
+#include "stg/conffiles.h"
+#include "stg/version.h"
 #include "listener.h"
 #include "pidfile.h"
-#include "version.h"
 
 using namespace std;
 
@@ -255,8 +256,6 @@ int ForkAndWait(const string & confDir)
 {
 #ifndef NO_DAEMON
 stgChildPid = fork();
-string startFile = confDir + START_FILE;
-unlink(startFile.c_str());
 
 switch (stgChildPid)
     {
@@ -272,23 +271,6 @@ switch (stgChildPid)
         break;
 
     default:    // Parent
-        for (int i = 0; i < 120 * 5; i++)
-            {
-            if (access(startFile.c_str(), F_OK) == 0)
-                {
-                //printf("Fork successfull. Exit.\n");
-                unlink(startFile.c_str());
-                exit(0);
-                }
-
-            if (childExited)
-                {
-                unlink(startFile.c_str());
-                exit(1);
-                }
-            usleep(200000);
-            }
-        unlink(startFile.c_str());
         exit(1);
         break;
     }
@@ -406,11 +388,6 @@ listener->Start();
 WriteServLog("rscriptd started successfully.");
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 
-#ifndef NO_DAEMON
-string startFile(confDir + START_FILE);
-creat(startFile.c_str(), S_IRUSR);
-#endif
-
 while (nonstop.GetStatus())
     {
     usleep(100000);
@@ -436,4 +413,3 @@ delete cfg;
 return EXIT_SUCCESS;
 }
 //-----------------------------------------------------------------------------
-