Merge pull request #2 from bobr-kun/MySQL_custom_port

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

diff --git a/projects/rscriptd/main.cpp b/projects/rscriptd/main.cpp
index 1acc06c7946402d3a1e7f6819655b0de3de62e78..491689af75f37b8a3535e48dcd80afa4d5c7f272 100644 (file)
--- a/projects/rscriptd/main.cpp
+++ b/projects/rscriptd/main.cpp
@@ -16,7 +16,7 @@
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>

- *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
+ *    Author : Maksym Mamontov <stg@madf.info>

  */
 
  /*
  */
 
  /*


@@ -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,7 +71,7 @@ while (pid != executersPid.end())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

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

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


@@ -121,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);


@@ -130,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);


@@ -179,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


@@ -216,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;