Fixed encryption in srvconf.lib

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 8eacc9aca032aeb8e3bb458c32efde859db90621..200fd2a664e15f46e1d2228b20ba6f4db509bdd3 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -24,47 +24,42 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-//#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>

 #include <unistd.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <unistd.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>

-#include <sys/stat.h>
+#include <sys/types.h>

 #include <sys/wait.h>
 #include <sys/wait.h>

-#include <dlfcn.h>
-#include <fcntl.h>
+#include <sys/stat.h> // S_IRUSR
+#include <fcntl.h> // create

 
 #include <csignal>
 #include <cerrno>
 
 #include <csignal>
 #include <cerrno>

+#include <cstdio>
+#include <cstdlib> // srandom, exit

 #include <fstream>
 #include <vector>
 #include <set>
 #include <list>
 
 #include <fstream>
 #include <vector>
 #include <set>
 #include <list>
 

-#include "settings.h"
-#include "user.h"
+#include "stg/user.h"
+#include "stg/common.h"
+#include "stg/plugin.h"
+#include "stg/logger.h"
+#include "stg/scriptexecuter.h"
+#include "stg/version.h"
+#include "stg_timer.h"
+#include "settings_impl.h"

 #include "users_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"
 #include "users_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"

-#include "common.h"
-#include "traffcounter.h"
-#include "plugin.h"
-#include "stg_logger.h"
-#include "stg_timer.h"
+#include "services_impl.h"
+#include "corps_impl.h"
+#include "traffcounter_impl.h"

 #include "plugin_runner.h"
 #include "plugin_runner.h"

-#include "script_executer.h"
-#include "conffiles.h"
-#include "version.h"

 #include "store_loader.h"
 #include "pidfile.h"
 #include "eventloop.h"
 
 #include "store_loader.h"
 #include "pidfile.h"
 #include "eventloop.h"
 

-using namespace std;
-uint32_t        eip;
-

 #ifdef DEBUG
     #define MAIN_DEBUG (1)
     #define NO_DAEMON  (1)
 #ifdef DEBUG
     #define MAIN_DEBUG (1)
     #define NO_DAEMON  (1)


@@ -72,13 +67,16 @@ uint32_t        eip;
 
 #define START_FILE "/._ST_ART_ED_"
 
 
 #define START_FILE "/._ST_ART_ED_"
 

-static bool needRulesReloading = false;
-static bool childExited = false;
-//static pid_t executerPid;
-set<pid_t> executersPid;
-static pid_t stgChildPid;
+namespace
+{
+std::set<pid_t> executersPid;

 
 

-#include "pinger.h"
+bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs);
+bool StopModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs);
+void StartTimer();
+int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings);
+int ForkAndWait(const std::string & confDir);
+void KillExecuters();

 
 //-----------------------------------------------------------------------------
 bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
 
 //-----------------------------------------------------------------------------
 bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)


@@ -91,29 +89,7 @@ bool StopModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
 return lhs.GetStopPosition() > rhs.GetStopPosition();
 }
 //-----------------------------------------------------------------------------
 return lhs.GetStopPosition() > rhs.GetStopPosition();
 }
 //-----------------------------------------------------------------------------

-class STG_STOPPER
-{
-public:
-    STG_STOPPER() { nonstop = true; }
-    bool    GetStatus() const { return nonstop; };
-    #ifdef NO_DAEMON
-    void    Stop(const char * __file__, int __line__)
-    #else
-    void    Stop(const char *, int)
-    #endif
-        {
-        #ifdef NO_DAEMON
-        printfd(__FILE__, "Stg stopped at %s:%d\n", __file__, __line__);
-        #endif
-        nonstop = false;
-        }
-private:
-    bool nonstop;
-};
-//-----------------------------------------------------------------------------
-STG_STOPPER nonstop;
-//-----------------------------------------------------------------------------
-static void StartTimer()
+void StartTimer()

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


@@ -130,186 +106,11 @@ else
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-void CatchUSR1(int)
-{
-
-}
-//-----------------------------------------------------------------------------
-void CatchTERM(int sig)
-{
-/*
- *Function Name:CatchINT
- *Parameters: sig_num - ÎÏÍÅÒ ÓÉÇÎÁÌÁ
- *Description: ïÂÒÁÂÏÔÞÉË ÓÉÇÎÁÌÁ INT
- *Returns: îÉÞÅÇÏ
- */
-STG_LOGGER & WriteServLog = GetStgLogger();
-WriteServLog("Shutting down... %d", sig);
-
-//nonstop = false;
-nonstop.Stop(__FILE__, __LINE__);
-
-struct sigaction newsa, oldsa;
-sigset_t sigmask;
-
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGTERM);
-newsa.sa_handler = SIG_IGN;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGTERM, &newsa, &oldsa);
-
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGINT);
-newsa.sa_handler = SIG_IGN;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGINT, &newsa, &oldsa);
-}
-//-----------------------------------------------------------------------------
-void CatchPIPE(int)
-{
-STG_LOGGER & WriteServLog = GetStgLogger();
-WriteServLog("Broken pipe!");
-}
-//-----------------------------------------------------------------------------
-void CatchHUP(int)
-{
-needRulesReloading = true;
-}
-//-----------------------------------------------------------------------------
-void CatchCHLD(int)
-{
-int status;
-pid_t childPid;
-childPid = waitpid(-1, &status, WNOHANG);
-
-set<pid_t>::iterator pid;
-pid = executersPid.find(childPid);
-if (pid != executersPid.end())
-    {
-    executersPid.erase(pid);
-    if (executersPid.empty() && nonstop.GetStatus())
-        {
-        nonstop.Stop(__FILE__, __LINE__);
-        }
-    }
-if (childPid == stgChildPid)
-    {
-    childExited = true;
-    }
-}
-/*//-----------------------------------------------------------------------------
-void CatchSEGV(int, siginfo_t *, void *)
-{
-char fileName[50];
-sprintf(fileName, "/tmp/stg_segv.%d", getpid());
-FILE * f = fopen(fileName, "wt");
-if (f)
-    {
-    fprintf(f, "\nSignal info:\n~~~~~~~~~~~~\n");
-    fprintf(f, "numb:\t %d (%d)\n", sinfo->si_signo, sig);
-    fprintf(f, "errn:\t %d\n", sinfo->si_errno);
-    fprintf(f, "code:\t %d ", sinfo->si_code);
-
-    switch (sinfo->si_code)
-        {
-        case SEGV_MAPERR:
-            fprintf(f, "(SEGV_MAPERR - address not mapped to object)\n");
-            break;
-
-        case SEGV_ACCERR:
-            fprintf(f, "(SEGV_ACCERR - invalid permissions for mapped object)\n");
-            break;
-
-        default:
-            fprintf(f, "???\n");
-        }
-
-    fprintf(f, "addr:\t 0x%.8X\n",
-        (unsigned int)sinfo->si_addr);
-
-    Dl_info dlinfo;
-    //asm("movl %eip, eip");
-    if (dladdr((void*)CatchCHLD, &dlinfo))
-        {
-        fprintf(f, "SEGV point: %s %s\n", dlinfo.dli_fname, dlinfo.dli_sname);
-        }
-    else
-        {
-        fprintf(f, "Cannot find SEGV point\n");
-        }
-
-    fclose(f);
-    }
-
-struct sigaction segv_action, segv_action_old;
-
-segv_action.sa_handler = SIG_DFL;
-segv_action.sa_sigaction = NULL;
-segv_action.sa_flags = SA_SIGINFO;
-segv_action.sa_restorer = NULL;
-
-sigaction(SIGSEGV, &segv_action, &segv_action_old);
-}*/
-//-----------------------------------------------------------------------------
-static void SetSignalHandlers()
-{
-struct sigaction newsa, oldsa;
-sigset_t sigmask;
-///////
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGTERM);
-newsa.sa_handler = CatchTERM;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGTERM, &newsa, &oldsa);
-///////
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGUSR1);
-newsa.sa_handler = CatchUSR1;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGUSR1, &newsa, &oldsa);
-///////
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGINT);
-newsa.sa_handler = CatchTERM;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGINT, &newsa, &oldsa);
-//////
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGPIPE);
-newsa.sa_handler = CatchPIPE;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGPIPE, &newsa, &oldsa);
-//////
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGHUP);
-newsa.sa_handler = CatchHUP;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGHUP, &newsa, &oldsa);
-//////
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGCHLD);
-newsa.sa_handler = CatchCHLD;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGCHLD, &newsa, &oldsa);
-
-/*newsa.sa_handler = NULL;
-newsa.sa_sigaction = CatchSEGV;
-newsa.sa_flags = SA_SIGINFO;
-newsa.sa_restorer = NULL;
-sigaction(SIGSEGV, &newsa, &oldsa);*/
-
-return;
-}
-//-----------------------------------------------------------------------------
-int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS * settings)
+#if defined(LINUX) || defined(DARWIN)
+int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
+#else
+int StartScriptExecuter(char *, int msgKey, int * msgID, SETTINGS_IMPL * settings)
+#endif

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


@@ -317,7 +118,6 @@ if (*msgID == -11)   // If msgID == -11 - first call. Create queue
     {
     for (int i = 0; i < 2; i++)
         {
     {
     for (int i = 0; i < 2; i++)
         {

-        //WriteServLog("Creating queue with key=%d ...", msgKey);

         *msgID = msgget(msgKey, IPC_CREAT | IPC_EXCL | 0600);
 
         if (*msgID == -1)
         *msgID = msgget(msgKey, IPC_CREAT | IPC_EXCL | 0600);
 
         if (*msgID == -1)


@@ -331,7 +131,6 @@ if (*msgID == -11)   // If msgID == -11 - first call. Create queue
             else
                 {
                 msgctl(*msgID, IPC_RMID, NULL);
             else
                 {
                 msgctl(*msgID, IPC_RMID, NULL);

-                //printfd(__FILE__, "Queue removed!");

                 }
             }
         else
                 }
             }
         else


@@ -346,22 +145,26 @@ pid_t executerPid = fork();
 
 switch (executerPid)
     {
 
 switch (executerPid)
     {

-    case -1:    // ìÁÖÁ
+    case -1:

         WriteServLog("Fork error!");
         return -1;
 
         WriteServLog("Fork error!");
         return -1;
 

-    case 0:     // ðÏÔÏÍÏË
-        //close(0);
-        //close(1);
-        //close(2);
-        //setsid();
+    case 0:

         delete settings;
         delete settings;

-        Executer(msgKey, *msgID, executerPid, procName);
+#if defined(LINUX) || defined(DARWIN)
+        Executer(*msgID, executerPid, procName);
+#else
+        Executer(*msgID, executerPid);
+#endif

         return 1;
 
         return 1;
 

-    default:    // ïÓÎÏ×ÎÏÊ ÐÒÏÃÅÓÓ
+    default:

         if (executersPid.empty()) {
         if (executersPid.empty()) {

-            Executer(msgKey, *msgID, executerPid, NULL);
+#if defined(LINUX) || defined(DARWIN)
+            Executer(*msgID, executerPid, NULL);
+#else
+            Executer(*msgID, executerPid);
+#endif

         }
         executersPid.insert(executerPid);
     }
         }
         executersPid.insert(executerPid);
     }


@@ -369,45 +172,39 @@ return 0;
 }
 //-----------------------------------------------------------------------------
 #ifndef NO_DAEMON
 }
 //-----------------------------------------------------------------------------
 #ifndef NO_DAEMON

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

 #else
 #else

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

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

-stgChildPid = fork();
-string startFile = confDir + START_FILE;
+pid_t childPid = fork();
+std::string startFile = confDir + START_FILE;

 unlink(startFile.c_str());
 
 unlink(startFile.c_str());
 

-switch (stgChildPid)
+switch (childPid)

     {
     {

-    case -1:    // ìÁÖÁ
+    case -1:

         return -1;
         break;
 
         return -1;
         break;
 

-    case 0:     // ðÏÔÏÍÏË
-        //close(0);
+    case 0:

         close(1);
         close(2);
         setsid();
         break;
 
         close(1);
         close(2);
         setsid();
         break;
 

-    default:    // ïÓÎÏ×ÎÏÊ ÐÒÏÃÅÓÓ
+    default:
+        struct timespec ts = {0, 200000000};

         for (int i = 0; i < 120 * 5; i++)
             {
             if (access(startFile.c_str(), F_OK) == 0)
                 {
         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);
                 }
 
                 unlink(startFile.c_str());
                 exit(0);
                 }
 

-            if (childExited)
-                {
-                unlink(startFile.c_str());
-                exit(1);
-                }
-            usleep(200000);
+            nanosleep(&ts, NULL);

             }
         unlink(startFile.c_str());
         exit(1);
             }
         unlink(startFile.c_str());
         exit(1);


@@ -419,7 +216,7 @@ return 0;
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {
 //-----------------------------------------------------------------------------
 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())
     {


@@ -429,33 +226,18 @@ while (pid != executersPid.end())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

+} // namespace anonymous
+//-----------------------------------------------------------------------------

 int main(int argc, char * argv[])
 {
 int main(int argc, char * argv[])
 {

-
-/*
-  Initialization order:
-  - Logger
-  - Stg timer
-  - Settings
-  - Plugins
-  - Plugins settings
-  - Read Admins
-  - Read Tariffs
-  - Read Users
-  - Start Users
-  - Start Traffcounter
-  - Start Plugins
-  - Start pinger
-  - Set signal nandlers
-  - Fork and exit
- * */
-
-SETTINGS * settings = NULL;
+SETTINGS_IMPL * settings = NULL;

 STORE * dataStore = NULL;
 STORE * dataStore = NULL;

-TARIFFS * tariffs = NULL;
-ADMINS * admins = NULL;
-USERS * users = NULL;
-TRAFFCOUNTER * traffCnt = NULL;
+TARIFFS_IMPL * tariffs = NULL;
+ADMINS_IMPL * admins = NULL;
+USERS_IMPL * users = NULL;
+TRAFFCOUNTER_IMPL * traffCnt = NULL;
+SERVICES_IMPL * services = NULL;
+CORPORATIONS_IMPL * corps = NULL;

 int msgID = -11;
 
     {
 int msgID = -11;
 
     {


@@ -463,10 +245,10 @@ int msgID = -11;
     WriteServLog.SetLogFileName("/var/log/stargazer.log");
     }
 
     WriteServLog.SetLogFileName("/var/log/stargazer.log");
     }
 

-vector<MODULE_SETTINGS> modSettings;
-list<PLUGIN_RUNNER> modules;
+std::vector<MODULE_SETTINGS> modSettings;
+std::list<PLUGIN_RUNNER> modules;

 
 

-list<PLUGIN_RUNNER>::iterator modIter;
+std::list<PLUGIN_RUNNER>::iterator modIter;

 
 if (getuid())
     {
 
 if (getuid())
     {


@@ -475,13 +257,12 @@ if (getuid())
     }
 
 if (argc == 2)
     }
 
 if (argc == 2)

-    settings = new SETTINGS(argv[1]);
+    settings = new SETTINGS_IMPL(argv[1]);

 else
 else

-    settings = new SETTINGS();
+    settings = new SETTINGS_IMPL();

 
 if (settings->ReadSettings())
     {
 
 if (settings->ReadSettings())
     {

-    //printfd(__FILE__, "ReadSettings error.\n");

     STG_LOGGER & WriteServLog = GetStgLogger();
 
     if (settings->GetLogFileName() != "")
     STG_LOGGER & WriteServLog = GetStgLogger();
 
     if (settings->GetLogFileName() != "")


@@ -492,7 +273,7 @@ if (settings->ReadSettings())
     }
 
 #ifndef NO_DAEMON
     }
 
 #ifndef NO_DAEMON

-string startFile(settings->GetConfDir() + START_FILE);
+std::string startFile(settings->GetConfDir() + START_FILE);

 #endif
 
 if (ForkAndWait(settings->GetConfDir()) < 0)
 #endif
 
 if (ForkAndWait(settings->GetConfDir()) < 0)


@@ -524,6 +305,10 @@ for (size_t i = 0; i < settings->GetExecutersNum(); i++)
 
 PIDFile pidFile(settings->GetPIDFileName());
 
 
 PIDFile pidFile(settings->GetPIDFileName());
 

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 StartTimer();
 WaitTimer();
 if (!IsStgTimerRunning())
 StartTimer();
 WaitTimer();
 if (!IsStgTimerRunning())


@@ -552,15 +337,17 @@ WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion()
 
 tariffs = new TARIFFS_IMPL(dataStore);
 admins = new ADMINS_IMPL(dataStore);
 
 tariffs = new TARIFFS_IMPL(dataStore);
 admins = new ADMINS_IMPL(dataStore);

-users = new USERS_IMPL(settings, dataStore, tariffs, *admins->GetSysAdmin());
-traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
+users = new USERS_IMPL(settings, dataStore, tariffs, admins->GetSysAdmin());
+traffCnt = new TRAFFCOUNTER_IMPL(users, settings->GetRulesFileName());
+services = new SERVICES_IMPL(dataStore);
+corps = new CORPORATIONS_IMPL(dataStore);

 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 modSettings = settings->GetModulesSettings();
 
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 modSettings = settings->GetModulesSettings();
 

-for (unsigned i = 0; i < modSettings.size(); i++)
+for (size_t i = 0; i < modSettings.size(); i++)

     {
     {

-    string modulePath = settings->GetModulesPath();
+    std::string modulePath = settings->GetModulesPath();

     modulePath += "/mod_";
     modulePath += modSettings[i].moduleName;
     modulePath += ".so";
     modulePath += "/mod_";
     modulePath += modSettings[i].moduleName;
     modulePath += ".so";


@@ -571,6 +358,8 @@ for (unsigned i = 0; i < modSettings.size(); i++)
                       admins,
                       tariffs,
                       users,
                       admins,
                       tariffs,
                       users,

+                      services,
+                      corps,

                       traffCnt,
                       dataStore,
                       settings)
                       traffCnt,
                       dataStore,
                       settings)


@@ -581,17 +370,16 @@ modIter = modules.begin();
 
 while (modIter != modules.end())
     {
 
 while (modIter != modules.end())
     {

-    //Loading modules

     if (modIter->Load())
         {
     if (modIter->Load())
         {

-        WriteServLog("Error: %s",
+        WriteServLog("Error loading module '%s': %s",
+                     modIter->GetPlugin()->GetVersion().c_str(),

                      modIter->GetStrError().c_str());
         goto exitLblNotStarted;
         }
     ++modIter;
     }
 
                      modIter->GetStrError().c_str());
         goto exitLblNotStarted;
         }
     ++modIter;
     }
 

-//Start section

 if (users->Start())
     {
     goto exitLblNotStarted;
 if (users->Start())
     {
     goto exitLblNotStarted;


@@ -612,32 +400,16 @@ while (modIter != modules.end())
     {
     if (modIter->Start())
         {
     {
     if (modIter->Start())
         {

-        WriteServLog("Error: %s",
+        WriteServLog("Error starting module '%s': %s",
+                     modIter->GetPlugin()->GetVersion().c_str(),

                      modIter->GetStrError().c_str());
                      modIter->GetStrError().c_str());

-        //printfd(__FILE__, "Error: %s\n", capRunner.GetStrError().c_str());

         goto exitLbl;
         }
         goto exitLbl;
         }

-    WriteServLog("Module: \'%s\'. Start successfull. %d", modIter->GetPlugin()->GetVersion().c_str(),
-        modIter->GetPlugin()->GetStartPosition());
+    WriteServLog("Module: '%s'. Start successfull.", modIter->GetPlugin()->GetVersion().c_str());

     ++modIter;
     }
     ++modIter;
     }

-SetSignalHandlers();

 
 

-srandom(stgTime);
-
-/*
- * Note that an implementation in which nice returns the new nice value
- * can legitimately return -1.   To  reliably  detect  an  error,  set
- * errno to 0 before the call, and check its value when nice returns -1.
- *
- *
- * (c) man 2 nice
- */
-errno = 0;
-if (nice(-19) && errno) {
-    printfd(__FILE__, "nice failed: '%s'\n", strerror(errno));
-    WriteServLog("nice failed: '%s'", strerror(errno));
-}
+srandom(static_cast<unsigned int>(stgTime));

 
 WriteServLog("Stg started successfully.");
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 
 WriteServLog("Stg started successfully.");
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");


@@ -646,26 +418,57 @@ WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 creat(startFile.c_str(), S_IRUSR);
 #endif
 
 creat(startFile.c_str(), S_IRUSR);
 #endif
 

-while (nonstop.GetStatus())
+while (true)

     {
     {

-    if (needRulesReloading)
+    sigfillset(&signalSet);
+    int sig = 0;
+    sigwait(&signalSet, &sig);
+    bool stop = false;
+    int status;
+    pid_t childPid;
+    std::set<pid_t>::iterator it;
+    switch (sig)

         {
         {

-        needRulesReloading = false;
-        traffCnt->Reload();
+        case SIGHUP:
+            traffCnt->Reload();
+            modIter = modules.begin();
+            for (; modIter != modules.end(); ++modIter)
+                {
+                if (modIter->Reload())
+                    {
+                    WriteServLog("Error reloading module '%s': '%s'", modIter->GetPlugin()->GetVersion().c_str(),
+                                                              modIter->GetStrError().c_str());
+                    printfd(__FILE__, "Error reloading module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(),
+                                                                     modIter->GetStrError().c_str());
+                    }
+                }
+            break;
+        case SIGTERM:
+            stop = true;
+            break;
+        case SIGINT:
+            stop = true;
+            break;
+        case SIGPIPE:
+            WriteServLog("Broken pipe!");
+            break;
+        case SIGCHLD:
+            childPid = waitpid(-1, &status, WNOHANG);

 
 

-        modIter = modules.begin();
-        for (; modIter != modules.end(); ++modIter)
-            {
-            if (modIter->Reload())
+            it = executersPid.find(childPid);
+            if (it != executersPid.end())

                 {
                 {

-                WriteServLog("Error reloading %s ('%s')", modIter->GetPlugin()->GetVersion().c_str(),
-                                                          modIter->GetStrError().c_str());
-                printfd(__FILE__, "Error reloading %s ('%s')\n", modIter->GetPlugin()->GetVersion().c_str(),
-                                                                 modIter->GetStrError().c_str());
+                executersPid.erase(it);
+                if (executersPid.empty())
+                    stop = true;

                 }
                 }

-            }
+            break;
+        default:
+            WriteServLog("Ignore signal %d", sig);
+            break;

         }
         }

-    stgUsleep(100000);
+    if (stop)
+        break;

     }
 
 exitLbl:
     }
 
 exitLbl:


@@ -681,14 +484,15 @@ while (modIter != modules.end())
     printfd(__FILE__, "Stopping module '%s'\n", name.c_str());
     if (modIter->Stop())
         {
     printfd(__FILE__, "Stopping module '%s'\n", name.c_str());
     if (modIter->Stop())
         {

-        WriteServLog("Module \'%s\': Error: %s",
+        WriteServLog("Error stopping module '%s': %s",

                      modIter->GetPlugin()->GetVersion().c_str(),
                      modIter->GetStrError().c_str());
                      modIter->GetPlugin()->GetVersion().c_str(),
                      modIter->GetStrError().c_str());

-        printfd(__FILE__, "Failed to stop module '%s'\n", name.c_str());
-        //printfd(__FILE__, "Error: %s\n", capRunner.GetStrError().c_str());
-        //goto exitLbl;
+        printfd(__FILE__, "Error stopping module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(), modIter->GetStrError().c_str());
+        }
+    else
+        {
+        WriteServLog("Module: '%s'. Stop successfull.", modIter->GetPlugin()->GetVersion().c_str());

         }
         }

-    WriteServLog("Module: \'%s\'. Stop successfull.", modIter->GetPlugin()->GetVersion().c_str());

     ++modIter;
     }
 
     ++modIter;
     }
 


@@ -703,13 +507,20 @@ modIter = modules.begin();
 while (modIter != modules.end())
     {
     std::string name = modIter->GetFileName();
 while (modIter != modules.end())
     {
     std::string name = modIter->GetFileName();

-    printfd(__FILE__, "Unloading module '%s'\n", name.c_str());
-    if (modIter->Unload())
+    if (modIter->IsRunning())

         {
         {

-        WriteServLog("Module \'%s\': Error: %s",
-                     name.c_str(),
-                     modIter->GetStrError().c_str());
-        printfd(__FILE__, "Failed to unload module '%s'\n", name.c_str());
+        printfd(__FILE__, "Passing module '%s' `cause it's still running\n", name.c_str());
+        }
+    else
+        {
+        printfd(__FILE__, "Unloading module '%s'\n", name.c_str());
+        if (modIter->Unload())
+            {
+            WriteServLog("Error unloading module '%s': '%s'",
+                         modIter->GetPlugin()->GetVersion().c_str(),
+                         modIter->GetStrError().c_str());
+            printfd(__FILE__, "Error unloading module '%s': '%s'\n", modIter->GetPlugin()->GetVersion().c_str(), modIter->GetStrError().c_str());
+            }

         }
     ++modIter;
     }
         }
     ++modIter;
     }


@@ -733,30 +544,22 @@ if (res)
 else
     WriteServLog("Queue removed successfully.");
 
 else
     WriteServLog("Queue removed successfully.");
 

-/*struct sigaction newsa, oldsa;
-sigset_t sigmask;
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGCHLD);
-newsa.sa_handler = SIG_IGN;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGCHLD, &newsa, &oldsa);*/
-

 KillExecuters();
 
 StopStgTimer();
 WriteServLog("StgTimer: Stop successfull.");
 
 KillExecuters();
 
 StopStgTimer();
 WriteServLog("StgTimer: Stop successfull.");
 

-WriteServLog("Stg stopped successfully.");
-sleep(1);
-WriteServLog("---------------------------------------------");
-
+delete corps;
+delete services;

 delete traffCnt;
 delete users;
 delete admins;
 delete tariffs;
 delete settings;
 
 delete traffCnt;
 delete users;
 delete admins;
 delete tariffs;
 delete settings;
 

+WriteServLog("Stg stopped successfully.");
+WriteServLog("---------------------------------------------");
+

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------