Pretty-printing CTX diff.

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 020af9dad817727d8f66f2a580f2b7e7e0de9c55..bcf7af777f2bec80e9b8c89a11a54bcf63a05159 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -18,557 +18,389 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

- /*
- $Revision: 1.124 $
- $Date: 2010/10/04 20:19:12 $
- $Author: faust $
- */
-
-#include <unistd.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h> // S_IRUSR
-#include <fcntl.h> // create
-
-#include <csignal>
-#include <cerrno>
-#include <cstdio>
-#include <cstdlib> // srandom, exit
-#include <fstream>
-#include <vector>
-#include <set>
-#include <list>
-
-#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 "store_loader.h"
+#include "plugin_mgr.h"
+#include "plugin_runner.h"

 #include "users_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"
 #include "services_impl.h"
 #include "corps_impl.h"
 #include "traffcounter_impl.h"
 #include "users_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"
 #include "services_impl.h"
 #include "corps_impl.h"
 #include "traffcounter_impl.h"

-#include "plugin_runner.h"
-#include "store_loader.h"
+#include "settings_impl.h"

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

+#include "stg_timer.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 <fstream>
+#include <vector>
+#include <set>
+#include <csignal>
+#include <cerrno>
+#include <cstdio>
+#include <cstdlib> // srandom, exit
+
+#include <unistd.h>
+#include <sys/ipc.h>
+#include <sys/msg.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h> // S_IRUSR
+#include <fcntl.h> // create

 
 #ifdef DEBUG
 
 #ifdef DEBUG

-    #define MAIN_DEBUG (1)

     #define NO_DAEMON  (1)
 #endif
 
 #define START_FILE "/._ST_ART_ED_"
 
     #define NO_DAEMON  (1)
 #endif
 
 #define START_FILE "/._ST_ART_ED_"
 

+using STG::SettingsImpl;
+using STG::AdminsImpl;
+using STG::TraffCounterImpl;
+using STG::UsersImpl;
+using STG::TariffsImpl;
+using STG::ServicesImpl;
+using STG::CorporationsImpl;
+using STG::StoreLoader;
+

 namespace
 {
 namespace
 {

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

 
 

-bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs);
-bool StopModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs);

 void StartTimer();
 void StartTimer();

-int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings);
-int ForkAndWait(const std::string & confDir);
+int StartScriptExecuter(char* procName, int msgKey, int* msgID);
+int ForkAndWait(const std::string& confDir);

 void KillExecuters();
 
 void KillExecuters();
 

-//-----------------------------------------------------------------------------
-bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
-{
-return lhs.GetStartPosition() < rhs.GetStartPosition();
-}
-//-----------------------------------------------------------------------------
-bool StopModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
-{
-return lhs.GetStopPosition() > rhs.GetStopPosition();
-}

 //-----------------------------------------------------------------------------
 void StartTimer()
 {
 //-----------------------------------------------------------------------------
 void StartTimer()
 {

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

 
 

-if (RunStgTimer())
-    {
-    WriteServLog("Cannot start timer. Fatal.");
-    //printfd(__FILE__, "Cannot start timer. Fatal.\n");
-    exit(1);
-    }
-else
+    if (RunStgTimer())

     {
     {

-    WriteServLog("Timer thread started successfully.");
-    //printfd(__FILE__, "Timer thread started successfully.\n");
+        WriteServLog("Cannot start timer. Fatal.");
+        exit(1);

     }
     }

+    else
+        WriteServLog("Timer thread started successfully.");

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-#ifdef LINUX
-int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
+#if defined(LINUX) || defined(DARWIN)
+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
 {
 #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

     {
     {

-    for (int i = 0; i < 2; i++)
+        for (int i = 0; i < 2; i++)

         {
         {

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

 
 

-        if (*msgID == -1)
-            {
-            *msgID = msgget(msgKey, 0);

             if (*msgID == -1)
             if (*msgID == -1)

+            {
+                *msgID = msgget(msgKey, 0);
+                if (*msgID == -1)

                 {
                 {

-                WriteServLog("Message queue not created.");
-                return -1;
-                }
-            else
-                {
-                msgctl(*msgID, IPC_RMID, NULL);
+                    WriteServLog("Message queue not created.");
+                    return -1;

                 }
                 }

+                else
+                    msgctl(*msgID, IPC_RMID, NULL);

             }
             }

-        else
+            else

             {
             {

-            WriteServLog("Message queue created successfully. msgKey=%d msgID=%d", msgKey, *msgID);
-            break;
+                WriteServLog("Message queue created successfully. msgKey=%d msgID=%d", msgKey, *msgID);
+                break;

             }
         }
     }
 
             }
         }
     }
 

-pid_t executerPid = fork();
+    const auto pid = fork();

 
 

-switch (executerPid)
+    switch (pid)

     {
     {

-    case -1:
-        WriteServLog("Fork error!");
-        return -1;
+        case -1:
+            WriteServLog("Fork error!");
+            return -1;

 
 

-    case 0:
-        delete settings;
-#ifdef LINUX
-        Executer(*msgID, executerPid, procName);
+        case 0:
+#if defined(LINUX) || defined(DARWIN)
+            Executer(*msgID, pid, procName);

 #else
 #else

-        Executer(*msgID, executerPid);
+            Executer(*msgID, pid);

 #endif
 #endif

-        return 1;
+            return 1;

 
 

-    default:
-        if (executersPid.empty()) {
-#ifdef LINUX
-            Executer(*msgID, executerPid, NULL);
+        default:
+            if (executers.empty()) {
+#if defined(LINUX) || defined(DARWIN)
+                Executer(*msgID, pid, NULL);

 #else
 #else

-            Executer(*msgID, executerPid);
+                Executer(*msgID, pid);

 #endif
 #endif

-        }
-        executersPid.insert(executerPid);
+            }
+            executers.insert(pid);

     }
     }

-return 0;
+    return 0;

 }
 //-----------------------------------------------------------------------------
 #ifndef NO_DAEMON
 }
 //-----------------------------------------------------------------------------
 #ifndef NO_DAEMON

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

 #else
 #else

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

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

-pid_t childPid = fork();
-std::string startFile = confDir + START_FILE;
-unlink(startFile.c_str());
+    const auto pid = fork();
+    const auto startFile = confDir + START_FILE;
+    unlink(startFile.c_str());

 
 

-switch (childPid)
+    switch (pid)

     {
     {

-    case -1:
-        return -1;
-        break;
+        case -1:
+            return -1;
+            break;

 
 

-    case 0:
-        close(1);
-        close(2);
-        setsid();
-        break;
+        case 0:
+            close(1);
+            close(2);
+            setsid();
+            break;

 
 

-    default:
-        struct timespec ts = {0, 200000000};
-        for (int i = 0; i < 120 * 5; i++)
+        default:
+            struct timespec ts = {0, 200000000};
+            for (int i = 0; i < 120 * 5; i++)

             {
             {

-            if (access(startFile.c_str(), F_OK) == 0)
+                if (access(startFile.c_str(), F_OK) == 0)

                 {
                 {

-                unlink(startFile.c_str());
-                exit(0);
+                    unlink(startFile.c_str());
+                    exit(0);

                 }
 
                 }
 

-            nanosleep(&ts, NULL);
+                nanosleep(&ts, NULL);

             }
             }

-        unlink(startFile.c_str());
-        exit(1);
-        break;
+            unlink(startFile.c_str());
+            exit(1);
+            break;

     }
 #endif
     }
 #endif

-return 0;
+    return 0;

 }
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {
 }
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {

-std::set<pid_t>::iterator pid;
-pid = executersPid.begin();
-while (pid != executersPid.end())
+    auto pid = executers.begin();
+    while (pid != executers.end())

     {
     {

-    printfd(__FILE__, "KillExecuters pid=%d\n", *pid);
-    kill(*pid, SIGUSR1);
-    ++pid;
+        printfd(__FILE__, "KillExecuters pid=%d\n", *pid);
+        kill(*pid, SIGUSR1);
+        ++pid;

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

-int main(int argc, char * argv[])
+int main(int argc, char* argv[])

 {
 {

-SETTINGS_IMPL * settings = NULL;
-STORE * dataStore = 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;
-
-    {
-    STG_LOGGER & WriteServLog = GetStgLogger();
-    WriteServLog.SetLogFileName("/var/log/stargazer.log");
-    }
-
-std::vector<MODULE_SETTINGS> modSettings;
-std::list<PLUGIN_RUNNER> modules;
+    int msgID = -11;

 
 

-std::list<PLUGIN_RUNNER>::iterator modIter;
+    STG::Logger::get().setFileName("/var/log/stargazer.log");

 
 

-if (getuid())
+    if (getuid())

     {
     {

-    printf("You must be root. Exit.\n");
-    exit(1);
+        printf("You must be root. Exit.\n");
+        return 1;

     }
 
     }
 

-if (argc == 2)
-    settings = new SETTINGS_IMPL(argv[1]);
-else
-    settings = new SETTINGS_IMPL();
+    SettingsImpl settings(argc == 2 ? argv[1] : "");

 
 

-if (settings->ReadSettings())
+    if (settings.ReadSettings())

     {
     {

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

 
 

-    if (settings->GetLogFileName() != "")
-        WriteServLog.SetLogFileName(settings->GetLogFileName());
+        if (settings.GetLogFileName() != "")
+            WriteServLog.setFileName(settings.GetLogFileName());

 
 

-    WriteServLog("ReadSettings error. %s", settings->GetStrError().c_str());
-    exit(1);
+        WriteServLog("ReadSettings error. %s", settings.GetStrError().c_str());
+        return -1;

     }
     }

-    /*************************************************************************************************/
-    printfd(__FILE__, "--- Script params dump ---\n");
-    std::vector<std::string>::const_iterator it(settings->GetScriptParams().begin());
-    while (it != settings->GetScriptParams().end())
-        {
-        printfd(__FILE__, "%s\n", it->c_str());
-        ++it;
-        }
-    printfd(__FILE__, "--- End dump ---\n");
-    /*************************************************************************************************/
+

 #ifndef NO_DAEMON
 #ifndef NO_DAEMON

-std::string startFile(settings->GetConfDir() + START_FILE);
+    const auto startFile = settings.GetConfDir() + START_FILE;

 #endif
 
 #endif
 

-if (ForkAndWait(settings->GetConfDir()) < 0)
+    if (ForkAndWait(settings.GetConfDir()) < 0)

     {
     {

-    STG_LOGGER & WriteServLog = GetStgLogger();
-    WriteServLog("Fork error!");
-    exit(1);
+        STG::Logger::get()("Fork error!");
+        return -1;

     }
 
     }
 

-STG_LOGGER & WriteServLog = GetStgLogger();
-WriteServLog.SetLogFileName(settings->GetLogFileName());
-WriteServLog("Stg v. %s", SERVER_VERSION);
+    auto& WriteServLog = STG::Logger::get();
+    WriteServLog.setFileName(settings.GetLogFileName());
+    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);
-    if (ret < 0)
-        {
-        STG_LOGGER & WriteServLog = GetStgLogger();
-        WriteServLog("Start Script Executer error!");
-        return 1;
-        }
-    if (ret == 1)
+        auto ret = StartScriptExecuter(argv[0], settings.GetExecMsgKey(), &msgID);
+        if (ret < 0)

         {
         {

-        // Stopping child
-        return 0;
+            STG::Logger::get()("Start Script Executer error!");
+            return -1;

         }
         }

+        if (ret == 1)
+            return 0;

     }
 
     }
 

-PIDFile pidFile(settings->GetPIDFileName());
+    PIDFile pidFile(settings.GetPIDFileName());
+
+    struct sigaction sa;
+    memset(&sa, 0, sizeof(sa));
+    sa.sa_handler = SIG_DFL;
+    sigaction(SIGHUP, &sa, NULL); // Apparently FreeBSD ignores SIGHUP by default when launched from rc.d at bot time.

 
 

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

 
 

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

     {
     {

-    printfd(__FILE__, "Timer thread not started in 1 sec!\n");
-    WriteServLog("Timer thread not started in 1 sec!");
+        printfd(__FILE__, "Timer thread not started in 1 sec!\n");
+        WriteServLog("Timer thread not started in 1 sec!");
+        return -1;

     }
 
     }
 

-EVENT_LOOP & loop(EVENT_LOOP_SINGLETON::GetInstance());
+    auto& loop = EVENT_LOOP::instance();

 
 

-STORE_LOADER storeLoader(*settings);
-if (storeLoader.Load())
+    StoreLoader storeLoader(settings);
+    if (storeLoader.load())

     {
     {

-    WriteServLog("Storage plugin: '%s'", storeLoader.GetStrError().c_str());
-    goto exitLblNotStarted;
+        printfd(__FILE__, "Storage plugin: '%s'\n", storeLoader.GetStrError().c_str());
+        WriteServLog("Storage plugin: '%s'", storeLoader.GetStrError().c_str());
+        return -1;

     }
 
     }
 

-if (loop.Start())
+    if (loop.Start())

     {
     {

-    WriteServLog("Event loop not started.");
-    goto exitLblNotStarted;
+        printfd(__FILE__, "Event loop not started.\n");
+        WriteServLog("Event loop not started.");
+        return -1;

     }
 
     }
 

-dataStore = storeLoader.GetStore();
-WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion().c_str());
-
-tariffs = new TARIFFS_IMPL(dataStore);
-admins = new ADMINS_IMPL(dataStore);
-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();
-
-for (size_t i = 0; i < modSettings.size(); i++)
-    {
-    std::string modulePath = settings->GetModulesPath();
-    modulePath += "/mod_";
-    modulePath += modSettings[i].moduleName;
-    modulePath += ".so";
-    printfd(__FILE__, "Module: %s\n", modulePath.c_str());
-    modules.push_back(
-        PLUGIN_RUNNER(modulePath,
-                      modSettings[i],
-                      admins,
-                      tariffs,
-                      users,
-                      services,
-                      corps,
-                      traffCnt,
-                      dataStore,
-                      settings)
-        );
-    }
+    auto& store = storeLoader.get();
+    WriteServLog("Storage plugin: %s. Loading successfull.", store.GetVersion().c_str());

 
 

-modIter = modules.begin();
+    AdminsImpl admins(store);
+    TariffsImpl tariffs(&store);
+    tariffs.ReadTariffs();
+    ServicesImpl services(&store);
+    CorporationsImpl corps(&store);
+    UsersImpl users(&settings, &store, &tariffs, services, admins.sysAdmin());
+    TraffCounterImpl traffCnt(&users, settings.GetRulesFileName());
+    traffCnt.SetMonitorDir(settings.GetMonitorDir());

 
 

-while (modIter != modules.end())
-    {
-    if (modIter->Load())
-        {
-        WriteServLog("Error loading module '%s': %s",
-                     modIter->GetPlugin()->GetVersion().c_str(),
-                     modIter->GetStrError().c_str());
-        goto exitLblNotStarted;
-        }
-    ++modIter;
-    }
+    if (users.Start())
+        return -1;

 
 

-if (users->Start())
-    {
-    goto exitLblNotStarted;
-    }
-WriteServLog("Users started successfully.");
+    WriteServLog("Users started successfully.");

 
 

-if (traffCnt->Start())
-    {
-    goto exitLblNotStarted;
-    }
-WriteServLog("Traffcounter started successfully.");
+    if (traffCnt.Start())
+        return -1;

 
 

-//Sort by start order
-modules.sort(StartModCmp);
-modIter = modules.begin();
+    WriteServLog("Traffcounter started successfully.");

 
 

-while (modIter != modules.end())
-    {
-    if (modIter->Start())
-        {
-        WriteServLog("Error starting module '%s': %s",
-                     modIter->GetPlugin()->GetVersion().c_str(),
-                     modIter->GetStrError().c_str());
-        goto exitLbl;
-        }
-    WriteServLog("Module: '%s'. Start successfull.", modIter->GetPlugin()->GetVersion().c_str());
-    ++modIter;
-    }
+    STG::PluginManager manager(settings, store, admins, tariffs, services, corps, users, traffCnt);

 
 

-srandom(static_cast<unsigned int>(stgTime));
+    srandom(static_cast<unsigned int>(stgTime));

 
 

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

 
 #ifndef NO_DAEMON
 
 #ifndef NO_DAEMON

-creat(startFile.c_str(), S_IRUSR);
+    creat(startFile.c_str(), S_IRUSR);

 #endif
 
 #endif
 

-while (true)
+    bool running = true;
+    while (running)

     {
     {

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

         {
         {

-        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);
-
-            it = executersPid.find(childPid);
-            if (it != executersPid.end())
-                {
-                executersPid.erase(it);
-                if (executersPid.empty())
-                    stop = true;
-                }
-            break;
-        default:
-            WriteServLog("Ignore signel %d", sig);
-            break;
+            case SIGHUP:
+            {
+                SettingsImpl newSettings(settings);
+                if (newSettings.ReadSettings())
+                    WriteServLog("ReadSettings error. %s", newSettings.GetStrError().c_str());
+                else
+                    settings = newSettings;
+                WriteServLog.setFileName(settings.GetLogFileName());
+                traffCnt.Reload();
+                manager.reload(settings);
+                break;
+            }
+            case SIGTERM:
+                running = false;
+                break;
+            case SIGINT:
+                running = false;
+                break;
+            case SIGPIPE:
+                WriteServLog("Broken pipe!");
+                break;
+            case SIGCHLD:
+                executers.erase(waitpid(-1, &status, WNOHANG));
+                if (executers.empty())
+                    running = false;
+                break;
+            default:
+                WriteServLog("Ignore signal %d", sig);
+                break;

         }
         }

-    if (stop)
-        break;

     }
 
     }
 

-exitLbl:
+    WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");

 
 

-WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
+    manager.stop();

 
 

-//Sort by start order
-modules.sort(StopModCmp);
-modIter = modules.begin();
-while (modIter != modules.end())
-    {
-    std::string name = modIter->GetFileName();
-    printfd(__FILE__, "Stopping module '%s'\n", name.c_str());
-    if (modIter->Stop())
-        {
-        WriteServLog("Error stopping module '%s': %s",
-                     modIter->GetPlugin()->GetVersion().c_str(),
-                     modIter->GetStrError().c_str());
-        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());
-        }
-    ++modIter;
-    }
+    if (loop.Stop())
+        WriteServLog("Event loop not stopped.");

 
 

-if (loop.Stop())
-    {
-    WriteServLog("Event loop not stopped.");
-    }
+    if (!traffCnt.Stop())
+        WriteServLog("Traffcounter: Stop successfull.");

 
 

-exitLblNotStarted:
+    if (!users.Stop())
+        WriteServLog("Users: Stop successfull.");

 
 

-modIter = modules.begin();
-while (modIter != modules.end())
-    {
-    std::string name = modIter->GetFileName();
-    if (modIter->IsRunning())
-        {
-        printfd(__FILE__, "Passing module '%s' `cause it's still running\n", name.c_str());
-        }
+    sleep(1);
+    int res = msgctl(msgID, IPC_RMID, NULL);
+    if (res)
+        WriteServLog("Queue was not removed. id=%d", msgID);

     else
     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;
-    }
-
-if (traffCnt)
-    {
-    traffCnt->Stop();
-    WriteServLog("Traffcounter: Stop successfull.");
-    }
-
-if (users)
-    {
-    users->Stop();
-    WriteServLog("Users: Stop successfull.");
-    }
-
-sleep(1);
-int res = msgctl(msgID, IPC_RMID, NULL);
-if (res)
-    WriteServLog("Queue was not removed. id=%d", msgID);
-else
-    WriteServLog("Queue removed successfully.");
-
-KillExecuters();
+        WriteServLog("Queue removed successfully.");

 
 

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

 
 

-delete corps;
-delete services;
-delete traffCnt;
-delete users;
-delete admins;
-delete tariffs;
-delete settings;
+    StopStgTimer();
+    WriteServLog("StgTimer: Stop successfull.");

 
 

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

 
 

-return 0;
+    return 0;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------