Merge branch 'stg-2.409' into stg-2.409-radius

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 3db3b2669ede87b264d6c417108e2fb35342f6bc..3c216977b8725adc961712688157125481e3f0f1 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -66,7 +66,7 @@ namespace
 std::set<pid_t> executers;
 
 void StartTimer();
 std::set<pid_t> executers;
 
 void StartTimer();

-int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings);
+int StartScriptExecuter(char * procName, int msgKey, int * msgID);

 int ForkAndWait(const std::string & confDir);
 void KillExecuters();
 
 int ForkAndWait(const std::string & confDir);
 void KillExecuters();
 


@@ -89,9 +89,9 @@ else
 }
 //-----------------------------------------------------------------------------
 #if defined(LINUX) || defined(DARWIN)
 }
 //-----------------------------------------------------------------------------
 #if defined(LINUX) || defined(DARWIN)

-int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
+int StartScriptExecuter(char * procName, int msgKey, int * msgID)

 #else
 #else

-int StartScriptExecuter(char *, int msgKey, int * msgID, SETTINGS_IMPL * settings)
+int StartScriptExecuter(char *, int msgKey, int * msgID)

 #endif
 {
 STG_LOGGER & WriteServLog = GetStgLogger();
 #endif
 {
 STG_LOGGER & WriteServLog = GetStgLogger();


@@ -132,7 +132,6 @@ switch (pid)
         return -1;
 
     case 0:
         return -1;
 
     case 0:

-        delete settings;

 #if defined(LINUX) || defined(DARWIN)
         Executer(*msgID, pid, procName);
 #else
 #if defined(LINUX) || defined(DARWIN)
         Executer(*msgID, pid, procName);
 #else


@@ -251,7 +250,7 @@ WriteServLog("Stg v. %s", SERVER_VERSION);
 
 for (size_t i = 0; i < settings.GetExecutersNum(); i++)
     {
 
 for (size_t i = 0; i < settings.GetExecutersNum(); i++)
     {

-    int ret = StartScriptExecuter(argv[0], settings.GetExecMsgKey(), &msgID, &settings);
+    int ret = StartScriptExecuter(argv[0], settings.GetExecMsgKey(), &msgID);

     if (ret < 0)
         {
         STG_LOGGER & WriteServLog = GetStgLogger();
     if (ret < 0)
         {
         STG_LOGGER & WriteServLog = GetStgLogger();


@@ -364,6 +363,8 @@ while (running)
 
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 
 
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 

+manager.stop();
+

 if (loop.Stop())
     WriteServLog("Event loop not stopped.");
 
 if (loop.Stop())
     WriteServLog("Event loop not stopped.");