Break internal classes to interface and implementation

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 26eba64741cf8bde5991e3e0b19d535b4a953248..aa8bdef50543ca638904bb3e02b96988dfcd6bf5 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>


@@ -93,7 +94,7 @@ class STG_STOPPER
 {
 public:
     STG_STOPPER() { nonstop = true; }
 {
 public:
     STG_STOPPER() { nonstop = true; }

-    bool    GetStatus() { return nonstop; };
+    bool    GetStatus() const { return nonstop; };

     #ifdef NO_DAEMON
     void    Stop(const char * __file__, int __line__)
     #else
     #ifdef NO_DAEMON
     void    Stop(const char * __file__, int __line__)
     #else


@@ -493,7 +494,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 +505,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)


@@ -555,7 +554,6 @@ admins = new ADMINS(dataStore);
 users = new USERS(settings, dataStore, tariffs, admins->GetSysAdmin());
 traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 users = new USERS(settings, dataStore, tariffs, admins->GetSysAdmin());
 traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());

-//tariffs->SetUsers(users);

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


@@ -647,8 +645,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 +698,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 +711,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 +759,3 @@ delete settings;
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-
-