Merge remote-tracking branch 'github/master'

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

diff --git a/projects/rscriptd/main.cpp b/projects/rscriptd/main.cpp
index 354c0b36f3f71a19450093a67f7175e5af54072b..e7c54eec787fa11dd5c3793bb3f680c9908fc62b 100644 (file)
--- a/projects/rscriptd/main.cpp
+++ b/projects/rscriptd/main.cpp
@@ -48,8 +48,6 @@
 #include "listener.h"
 #include "pidfile.h"
 
 #include "listener.h"
 #include "pidfile.h"
 

-using namespace std;
-

 #ifdef DEBUG
 # define MAIN_DEBUG  1
 # define NO_DAEMON    1
 #ifdef DEBUG
 # define MAIN_DEBUG  1
 # define NO_DAEMON    1


@@ -57,13 +55,13 @@ using namespace std;
 
 #define START_FILE "/._ST_ART_ED_"
 
 
 #define START_FILE "/._ST_ART_ED_"
 

-set<pid_t> executersPid;
+std::set<pid_t> executersPid;

 volatile time_t stgTime = time(NULL);
 
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {
 volatile time_t stgTime = time(NULL);
 
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {

-set<pid_t>::iterator pid;
+std::set<pid_t>::iterator pid;

 pid = executersPid.begin();
 while (pid != executersPid.end())
     {
 pid = executersPid.begin();
 while (pid != executersPid.end())
     {


@@ -73,9 +71,13 @@ while (pid != executersPid.end())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

+#if defined(LINUX) || defined(DARWIN)

 int StartScriptExecuter(char * procName, int msgKey, int * msgID)
 int StartScriptExecuter(char * procName, int msgKey, int * msgID)

+#else
+int StartScriptExecuter(char *, int msgKey, int * msgID)
+#endif

 {
 {

-STG_LOGGER & WriteServLog = GetStgLogger();
+auto & WriteServLog = STG::Logger::get();

 
 if (*msgID == -11)   // If msgID == -11 - first call. Create queue
     {
 
 if (*msgID == -11)   // If msgID == -11 - first call. Create queue
     {


@@ -117,7 +119,7 @@ switch (executerPid)
         //close(1);
         //close(2);
         //setsid();
         //close(1);
         //close(2);
         //setsid();

-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)

         Executer(*msgID, executerPid, procName);
 #else
         Executer(*msgID, executerPid);
         Executer(*msgID, executerPid, procName);
 #else
         Executer(*msgID, executerPid);


@@ -126,7 +128,7 @@ switch (executerPid)
 
     default:    // Parent
         if (executersPid.empty())
 
     default:    // Parent
         if (executersPid.empty())

-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)

             Executer(*msgID, executerPid, NULL);
 #else
             Executer(*msgID, executerPid);
             Executer(*msgID, executerPid, NULL);
 #else
             Executer(*msgID, executerPid);


@@ -138,7 +140,7 @@ return 0;
 //-----------------------------------------------------------------------------
 void StopScriptExecuter(int msgID)
 {
 //-----------------------------------------------------------------------------
 void StopScriptExecuter(int msgID)
 {

-STG_LOGGER & WriteServLog = GetStgLogger();
+auto & WriteServLog = STG::Logger::get();

 
 for (int i = 0; i < 5; ++i)
     {
 
 for (int i = 0; i < 5; ++i)
     {


@@ -175,9 +177,9 @@ KillExecuters();
 }
 //-----------------------------------------------------------------------------
 #ifdef NO_DAEMON
 }
 //-----------------------------------------------------------------------------
 #ifdef NO_DAEMON

-int ForkAndWait(const string &)
+int ForkAndWait(const std::string &)

 #else
 #else

-int ForkAndWait(const string & confDir)
+int ForkAndWait(const std::string & confDir)

 #endif
 {
 #ifndef NO_DAEMON
 #endif
 {
 #ifndef NO_DAEMON


@@ -212,11 +214,11 @@ int msgID = -11;
 int execNum = 0;
 int execMsgKey = 0;
 
 int execNum = 0;
 int execMsgKey = 0;
 

-string logFileName;
-string confDir;
-string password;
-string onConnect;
-string onDisconnect;
+std::string logFileName;
+std::string confDir;
+std::string password;
+std::string onConnect;
+std::string onDisconnect;

 int port;
 int userTimeout;
 
 int port;
 int userTimeout;
 


@@ -233,8 +235,8 @@ else
 
 if (cfg->Error())
     {
 
 if (cfg->Error())
     {

-    STG_LOGGER & WriteServLog = GetStgLogger();
-    WriteServLog.SetLogFileName("/var/log/rscriptd.log");
+    auto & WriteServLog = STG::Logger::get();
+    WriteServLog.setFileName("/var/log/rscriptd.log");

     WriteServLog("Error reading config file!");
     delete cfg;
     return EXIT_FAILURE;
     WriteServLog("Error reading config file!");
     delete cfg;
     return EXIT_FAILURE;


@@ -252,15 +254,15 @@ cfg->ReadString("ScriptOnDisconnect", &onDisconnect, "/etc/rscriptd/OnDisconnect
 
 if (ForkAndWait(confDir) < 0)
     {
 
 if (ForkAndWait(confDir) < 0)
     {

-    STG_LOGGER & WriteServLog = GetStgLogger();
+    auto & WriteServLog = STG::Logger::get();

     WriteServLog("Fork error!");
     delete cfg;
     return EXIT_FAILURE;
     }
 
     WriteServLog("Fork error!");
     delete cfg;
     return EXIT_FAILURE;
     }
 

-STG_LOGGER & WriteServLog = GetStgLogger();
+auto & WriteServLog = STG::Logger::get();

 PIDFile pidFile("/var/run/rscriptd.pid");
 PIDFile pidFile("/var/run/rscriptd.pid");

-WriteServLog.SetLogFileName(logFileName);
+WriteServLog.setFileName(logFileName);

 WriteServLog("rscriptd v. %s", SERVER_VERSION);
 
 for (int i = 0; i < execNum; i++)
 WriteServLog("rscriptd v. %s", SERVER_VERSION);
 
 for (int i = 0; i < execNum; i++)


@@ -268,8 +270,7 @@ for (int i = 0; i < execNum; i++)
     int ret = StartScriptExecuter(argv[0], execMsgKey, &msgID);
     if (ret < 0)
         {
     int ret = StartScriptExecuter(argv[0], execMsgKey, &msgID);
     if (ret < 0)
         {

-        STG_LOGGER & WriteServLog = GetStgLogger();
-        WriteServLog("Start Script Executer error!");
+        STG::Logger::get()("Start Script Executer error!");

         delete cfg;
         return EXIT_FAILURE;
         }
         delete cfg;
         return EXIT_FAILURE;
         }