Fixed problem running plugin in non-debug mode.

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index cabd991be6361e3f08695173b9387f4d903acaaa..73786c4efd6c0cc46ba8aa805b9edaca0d9687cb 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -18,71 +18,60 @@
  *    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"

 
 

-using namespace std;
+#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_"
 

-set<pid_t> executersPid;
-
-//-----------------------------------------------------------------------------
-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)
+namespace

 {
 {

-return lhs.GetStopPosition() > rhs.GetStopPosition();
-}
+std::set<pid_t> executers;
+
+void StartTimer();
+int StartScriptExecuter(char * procName, int msgKey, int * msgID);
+int ForkAndWait(const std::string & confDir);
+void KillExecuters();
+

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-static void StartTimer()
+void StartTimer()

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


@@ -99,10 +88,10 @@ else
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

-#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
 {
 STG_LOGGER & WriteServLog = GetStgLogger();
 #endif
 {
 STG_LOGGER & WriteServLog = GetStgLogger();


@@ -134,48 +123,47 @@ if (*msgID == -11)   // If msgID == -11 - first call. Create queue
         }
     }
 
         }
     }
 

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

 
 

-switch (executerPid)
+switch (pid)

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

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

 #else
 #else

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

 #endif
         return 1;
 
     default:
 #endif
         return 1;
 
     default:

-        if (executersPid.empty()) {
-#ifdef LINUX
-            Executer(*msgID, executerPid, NULL);
+        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;
 }
 //-----------------------------------------------------------------------------
 #ifndef NO_DAEMON
     }
 return 0;
 }
 //-----------------------------------------------------------------------------
 #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

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

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

-switch (childPid)
+switch (pid)

     {
     case -1:
         return -1;
     {
     case -1:
         return -1;


@@ -209,9 +197,8 @@ return 0;
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {
 //-----------------------------------------------------------------------------
 void KillExecuters()
 {

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

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


@@ -219,73 +206,56 @@ while (pid != executersPid.end())
     }
 }
 //-----------------------------------------------------------------------------
     }
 }
 //-----------------------------------------------------------------------------

+} // 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;
 
 int msgID = -11;
 

-    {
-    STG_LOGGER & WriteServLog = GetStgLogger();
-    WriteServLog.SetLogFileName("/var/log/stargazer.log");
-    }
-
-vector<MODULE_SETTINGS> modSettings;
-list<PLUGIN_RUNNER> modules;
-
-list<PLUGIN_RUNNER>::iterator modIter;
+GetStgLogger().SetLogFileName("/var/log/stargazer.log");

 
 if (getuid())
     {
     printf("You must be root. Exit.\n");
 
 if (getuid())
     {
     printf("You must be root. Exit.\n");

-    exit(1);
+    return 1;

     }
 
     }
 

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

 
 

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

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

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

 
 

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

     }
 
 #ifndef NO_DAEMON
     }
 
 #ifndef NO_DAEMON

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

 #endif
 
 #endif
 

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

     {
     STG_LOGGER & WriteServLog = GetStgLogger();
     WriteServLog("Fork error!");
     {
     STG_LOGGER & WriteServLog = GetStgLogger();
     WriteServLog("Fork error!");

-    exit(1);
+    return -1;

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

-WriteServLog.SetLogFileName(settings->GetLogFileName());
+WriteServLog.SetLogFileName(settings.GetLogFileName());

 WriteServLog("Stg v. %s", SERVER_VERSION);
 
 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();
         WriteServLog("Start Script Executer error!");
     if (ret < 0)
         {
         STG_LOGGER & WriteServLog = GetStgLogger();
         WriteServLog("Start Script Executer error!");

-        return 1;
+        return -1;

         }
     if (ret == 1)
         {
         }
     if (ret == 1)
         {


@@ -294,7 +264,7 @@ for (size_t i = 0; i < settings->GetExecutersNum(); i++)
         }
     }
 
         }
     }
 

-PIDFile pidFile(settings->GetPIDFileName());
+PIDFile pidFile(settings.GetPIDFileName());

 
 sigset_t signalSet;
 sigfillset(&signalSet);
 
 sigset_t signalSet;
 sigfillset(&signalSet);


@@ -306,101 +276,50 @@ 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());
 
     }
 
 EVENT_LOOP & loop(EVENT_LOOP_SINGLETON::GetInstance());
 

-STORE_LOADER storeLoader(*settings);
+STORE_LOADER storeLoader(settings);

 if (storeLoader.Load())
     {
 if (storeLoader.Load())
     {

+    printfd(__FILE__, "Storage plugin: '%s'\n", storeLoader.GetStrError().c_str());

     WriteServLog("Storage plugin: '%s'", storeLoader.GetStrError().c_str());
     WriteServLog("Storage plugin: '%s'", storeLoader.GetStrError().c_str());

-    goto exitLblNotStarted;
+    return -1;

     }
 
 if (loop.Start())
     {
     }
 
 if (loop.Start())
     {

+    printfd(__FILE__, "Event loop not started.\n");

     WriteServLog("Event loop not started.");
     WriteServLog("Event loop not started.");

-    goto exitLblNotStarted;
+    return -1;

     }
 
     }
 

-dataStore = storeLoader.GetStore();
-WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion().c_str());
+STORE & store(storeLoader.GetStore());
+WriteServLog("Storage plugin: %s. Loading successfull.", store.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++)
-    {
-    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)
-        );
-    }
+ADMINS_IMPL admins(&store);
+TARIFFS_IMPL tariffs(&store);
+SERVICES_IMPL services(&store);
+CORPORATIONS_IMPL corps(&store);
+USERS_IMPL users(&settings, &store, &tariffs, services, admins.GetSysAdmin());
+TRAFFCOUNTER_IMPL traffCnt(&users, settings.GetRulesFileName());
+traffCnt.SetMonitorDir(settings.GetMonitorDir());

 
 

-modIter = modules.begin();
+if (users.Start())
+    return -1;

 
 

-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())
-    {
-    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(stgTime);
+srandom(static_cast<unsigned int>(stgTime));

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


@@ -409,124 +328,49 @@ WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 creat(startFile.c_str(), S_IRUSR);
 #endif
 
 creat(startFile.c_str(), S_IRUSR);
 #endif
 

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

     {
     sigfillset(&signalSet);
     int sig = 0;
     sigwait(&signalSet, &sig);
     {
     sigfillset(&signalSet);
     int sig = 0;
     sigwait(&signalSet, &sig);

-    bool stop = false;

     int status;
     int status;

-    pid_t childPid;
-    set<pid_t>::iterator it;

     switch (sig)
         {
         case SIGHUP:
     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());
-                    }
-                }
+            traffCnt.Reload();
+            manager.reload();

             break;
         case SIGTERM:
             break;
         case SIGTERM:

-            stop = true;
+            running = false;

             break;
         case SIGINT:
             break;
         case SIGINT:

-            stop = true;
+            running = false;

             break;
         case SIGPIPE:
             WriteServLog("Broken pipe!");
             break;
         case SIGCHLD:
             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;
-                }
+            executers.erase(waitpid(-1, &status, WNOHANG));
+            if (executers.empty())
+                running = false;

             break;
         default:
             break;
         default:

-            WriteServLog("Ignore signel %d", sig);
+            WriteServLog("Ignore signal %d", sig);

             break;
         }
             break;
         }

-    if (stop)
-        break;

     }
 
     }
 

-exitLbl:
-

 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 

-//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())
 if (loop.Stop())

-    {

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

-    }

 
 

-exitLblNotStarted:
-
-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());
-        }
-    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();
+if (!traffCnt.Stop())

     WriteServLog("Traffcounter: Stop successfull.");
     WriteServLog("Traffcounter: Stop successfull.");

-    }

 
 

-if (users)
-    {
-    users->Stop();
+if (!users.Stop())

     WriteServLog("Users: Stop successfull.");
     WriteServLog("Users: Stop successfull.");

-    }

 
 sleep(1);
 int res = msgctl(msgID, IPC_RMID, NULL);
 
 sleep(1);
 int res = msgctl(msgID, IPC_RMID, NULL);


@@ -540,14 +384,6 @@ KillExecuters();
 StopStgTimer();
 WriteServLog("StgTimer: Stop successfull.");
 
 StopStgTimer();
 WriteServLog("StgTimer: Stop successfull.");
 

-delete corps;
-delete services;
-delete traffCnt;
-delete users;
-delete admins;
-delete tariffs;
-delete settings;
-

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