Fix tariff field name in XML-RPC API documentation (tariff -> name)

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index aa8bdef50543ca638904bb3e02b96988dfcd6bf5..fc5172b0b3f3872d05a415024464732e4256ec3c 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -24,39 +24,37 @@
  $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 <fstream>
 #include <vector>
 #include <set>
 #include <list>
 
 #include <fstream>
 #include <vector>
 #include <set>
 #include <list>
 

-#include "settings.h"
-#include "user.h"
-#include "users.h"
-#include "admins.h"
-#include "common.h"
-#include "traffcounter.h"
-#include "base_plugin.h"
-#include "stg_logger.h"
+#include "stg/user.h"
+#include "stg/common.h"
+#include "stg/plugin.h"
+#include "stg/logger.h"
+#include "stg/scriptexecuter.h"
+#include "stg/conffiles.h"
+#include "stg/version.h"
+#include "stg/pinger.h"

 #include "stg_timer.h"
 #include "stg_timer.h"

+#include "settings_impl.h"
+#include "users_impl.h"
+#include "admins_impl.h"
+#include "tariffs_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"


@@ -77,7 +75,6 @@ static bool childExited = false;
 set<pid_t> executersPid;
 static pid_t stgChildPid;
 
 set<pid_t> executersPid;
 static pid_t stgChildPid;
 

-#include "pinger.h"

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


@@ -308,7 +305,7 @@ sigaction(SIGSEGV, &newsa, &oldsa);*/
 return;
 }
 //-----------------------------------------------------------------------------
 return;
 }
 //-----------------------------------------------------------------------------

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

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


@@ -316,7 +313,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)


@@ -330,7 +326,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


@@ -345,20 +340,16 @@ 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;
         Executer(msgKey, *msgID, executerPid, procName);
         return 1;
 
         delete settings;
         Executer(msgKey, *msgID, executerPid, procName);
         return 1;
 

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

         if (executersPid.empty()) {
             Executer(msgKey, *msgID, executerPid, NULL);
         }
         if (executersPid.empty()) {
             Executer(msgKey, *msgID, executerPid, NULL);
         }


@@ -380,23 +371,22 @@ unlink(startFile.c_str());
 
 switch (stgChildPid)
     {
 
 switch (stgChildPid)
     {

-    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);
                 }


@@ -406,7 +396,7 @@ switch (stgChildPid)
                 unlink(startFile.c_str());
                 exit(1);
                 }
                 unlink(startFile.c_str());
                 exit(1);
                 }

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

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


@@ -449,12 +439,12 @@ int main(int argc, char * argv[])
   - Fork and exit
  * */
 
   - Fork and exit
  * */
 

-SETTINGS * settings = NULL;
-BASE_STORE * dataStore = NULL;
-TARIFFS * tariffs = NULL;
-ADMINS * admins = NULL;
-USERS * users = NULL;
-TRAFFCOUNTER * traffCnt = NULL;
+SETTINGS_IMPL * settings = NULL;
+STORE * dataStore = NULL;
+TARIFFS_IMPL * tariffs = NULL;
+ADMINS_IMPL * admins = NULL;
+USERS_IMPL * users = NULL;
+TRAFFCOUNTER_IMPL * traffCnt = NULL;

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


@@ -474,13 +464,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() != "")


@@ -549,15 +538,15 @@ if (loop.Start())
 dataStore = storeLoader.GetStore();
 WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion().c_str());
 
 dataStore = storeLoader.GetStore();
 WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion().c_str());
 

-tariffs = new TARIFFS(dataStore);
-admins = new ADMINS(dataStore);
-users = new USERS(settings, dataStore, tariffs, admins->GetSysAdmin());
-traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
+tariffs = new TARIFFS_IMPL(dataStore);
+admins = new ADMINS_IMPL(dataStore);
+users = new USERS_IMPL(settings, dataStore, tariffs, admins->GetSysAdmin());
+traffCnt = new TRAFFCOUNTER_IMPL(users, tariffs, settings->GetRulesFileName());

 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();
     modulePath += "/mod_";
     {
     string modulePath = settings->GetModulesPath();
     modulePath += "/mod_";


@@ -616,8 +605,7 @@ while (modIter != modules.end())
         //printfd(__FILE__, "Error: %s\n", capRunner.GetStrError().c_str());
         goto exitLbl;
         }
         //printfd(__FILE__, "Error: %s\n", capRunner.GetStrError().c_str());
         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;
     }
 SetSignalHandlers();
     ++modIter;
     }
 SetSignalHandlers();


@@ -732,30 +720,20 @@ 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 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;
 }
 //-----------------------------------------------------------------------------