Pretty-printing CTX diff.

[stg.git] / projects / rscriptd / main.cpp

diff --git a/projects/rscriptd/main.cpp b/projects/rscriptd/main.cpp
index e7c54eec787fa11dd5c3793bb3f680c9908fc62b..1baca9e8b74a6345a07f4b3013203ba8d55aa64d 100644 (file)
--- a/projects/rscriptd/main.cpp
+++ b/projects/rscriptd/main.cpp
@@ -176,11 +176,7 @@ else
 KillExecuters();
 }
 //-----------------------------------------------------------------------------
 KillExecuters();
 }
 //-----------------------------------------------------------------------------

-#ifdef NO_DAEMON
-int ForkAndWait(const std::string &)
-#else
-int ForkAndWait(const std::string & confDir)
-#endif
+int ForkAndWait()

 {
 #ifndef NO_DAEMON
 pid_t childPid = fork();
 {
 #ifndef NO_DAEMON
 pid_t childPid = fork();


@@ -252,7 +248,7 @@ cfg->ReadInt("UserTimeout", &userTimeout, 60);
 cfg->ReadString("ScriptOnConnect", &onConnect, "/etc/rscriptd/OnConnect");
 cfg->ReadString("ScriptOnDisconnect", &onDisconnect, "/etc/rscriptd/OnDisconnect");
 
 cfg->ReadString("ScriptOnConnect", &onConnect, "/etc/rscriptd/OnConnect");
 cfg->ReadString("ScriptOnDisconnect", &onDisconnect, "/etc/rscriptd/OnDisconnect");
 

-if (ForkAndWait(confDir) < 0)
+if (ForkAndWait() < 0)

     {
     auto & WriteServLog = STG::Logger::get();
     WriteServLog("Fork error!");
     {
     auto & WriteServLog = STG::Logger::get();
     WriteServLog("Fork error!");