GetScriptDir -> GetScriptsDir

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 7a225ce5de4061f7d837d02ba863b31db9ab7532..6a8c61f51dea08829f1a4fd38a45ccdd585e575b 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -24,7 +24,7 @@
  $Author: faust $
  */
 
  $Author: faust $
  */
 

-#include <stdio.h>
+//#include <stdio.h>

 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>


@@ -35,9 +35,10 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <dlfcn.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <dlfcn.h>

-#include <signal.h>

 #include <fcntl.h>
 
 #include <fcntl.h>
 

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

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


@@ -45,11 +46,12 @@
 
 #include "settings.h"
 #include "user.h"
 
 #include "settings.h"
 #include "user.h"

-#include "users.h"
-#include "admins.h"
+#include "users_impl.h"
+#include "admins_impl.h"
+#include "tariffs_impl.h"

 #include "common.h"
 #include "traffcounter.h"
 #include "common.h"
 #include "traffcounter.h"

-#include "base_plugin.h"
+#include "plugin.h"

 #include "stg_logger.h"
 #include "stg_timer.h"
 #include "plugin_runner.h"
 #include "stg_logger.h"
 #include "stg_timer.h"
 #include "plugin_runner.h"


@@ -449,7 +451,7 @@ int main(int argc, char * argv[])
  * */
 
 SETTINGS * settings = NULL;
  * */
 
 SETTINGS * settings = NULL;

-BASE_STORE * dataStore = NULL;
+STORE * dataStore = NULL;

 TARIFFS * tariffs = NULL;
 ADMINS * admins = NULL;
 USERS * users = NULL;
 TARIFFS * tariffs = NULL;
 ADMINS * admins = NULL;
 USERS * users = NULL;


@@ -493,7 +495,6 @@ if (settings->ReadSettings())
 string startFile(settings->GetConfDir() + START_FILE);
 #endif
 
 string startFile(settings->GetConfDir() + START_FILE);
 #endif
 

-//SetSignalHandlers();

 if (ForkAndWait(settings->GetConfDir()) < 0)
     {
     STG_LOGGER & WriteServLog = GetStgLogger();
 if (ForkAndWait(settings->GetConfDir()) < 0)
     {
     STG_LOGGER & WriteServLog = GetStgLogger();


@@ -505,14 +506,13 @@ STG_LOGGER & WriteServLog = GetStgLogger();
 WriteServLog.SetLogFileName(settings->GetLogFileName());
 WriteServLog("Stg v. %s", SERVER_VERSION);
 
 WriteServLog.SetLogFileName(settings->GetLogFileName());
 WriteServLog("Stg v. %s", SERVER_VERSION);
 

-for (int 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!");
     {
     int ret = StartScriptExecuter(argv[0], settings->GetExecMsgKey(), &msgID, settings);
     if (ret < 0)
         {
         STG_LOGGER & WriteServLog = GetStgLogger();
         WriteServLog("Start Script Executer error!");

-        //goto exitLbl;

         return 1;
         }
     if (ret == 1)
         return 1;
         }
     if (ret == 1)


@@ -550,12 +550,11 @@ 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());
+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());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());

-//tariffs->SetUsers(users);

 
 modSettings = settings->GetModulesSettings();
 
 
 modSettings = settings->GetModulesSettings();
 


@@ -647,8 +646,6 @@ WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
 creat(startFile.c_str(), S_IRUSR);
 #endif
 
 creat(startFile.c_str(), S_IRUSR);
 #endif
 

-//*a_kill_it = 0;
-

 while (nonstop.GetStatus())
     {
     if (needRulesReloading)
 while (nonstop.GetStatus())
     {
     if (needRulesReloading)


@@ -702,7 +699,7 @@ if (loop.Stop())
 
 exitLblNotStarted:
 
 
 exitLblNotStarted:
 

-/*modIter = modules.begin();
+modIter = modules.begin();

 while (modIter != modules.end())
     {
     std::string name = modIter->GetFileName();
 while (modIter != modules.end())
     {
     std::string name = modIter->GetFileName();


@@ -715,7 +712,7 @@ while (modIter != modules.end())
         printfd(__FILE__, "Failed to unload module '%s'\n", name.c_str());
         }
     ++modIter;
         printfd(__FILE__, "Failed to unload module '%s'\n", name.c_str());
         }
     ++modIter;

-    }*/
+    }

 
 if (traffCnt)
     {
 
 if (traffCnt)
     {


@@ -763,5 +760,3 @@ delete settings;
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-
-