X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/12aae76fbeaa3dc91ab5ecad5531a2c1925340d2..b06f96581715a1cb67b70592fa7fd1ad34eb1dd1:/projects/stargazer/main.cpp?ds=sidebyside

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 63d5a6b0..cdaee3b0 100644
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -24,40 +24,38 @@
  $Author: faust $
  */
 
-/*#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 <sys/types.h>
 #include <sys/wait.h>
-/*#include <sys/stat.h>
-#include <dlfcn.h>
-#include <fcntl.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/conffiles.h"
+#include "stg/version.h"
+#include "stg/pinger.h"
+#include "stg_timer.h"
 #include "settings_impl.h"
-#include "user.h"
 #include "users_impl.h"
 #include "admins_impl.h"
 #include "tariffs_impl.h"
-#include "common.h"
-#include "traffcounter.h"
-#include "plugin.h"
-#include "stg_logger.h"
-#include "stg_timer.h"
+#include "traffcounter_impl.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"
@@ -78,7 +76,6 @@ static bool childExited = false;
 set<pid_t> executersPid;
 static pid_t stgChildPid;
 
-#include "pinger.h"
 
 //-----------------------------------------------------------------------------
 bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
@@ -350,12 +347,12 @@ switch (executerPid)
 
     case 0:
         delete settings;
-        Executer(msgKey, *msgID, executerPid, procName);
+        Executer(*msgID, executerPid, procName);
         return 1;
 
     default:
         if (executersPid.empty()) {
-            Executer(msgKey, *msgID, executerPid, NULL);
+            Executer(*msgID, executerPid, NULL);
         }
         executersPid.insert(executerPid);
     }
@@ -386,6 +383,7 @@ switch (stgChildPid)
         break;
 
     default:
+        struct timespec ts = {0, 200000000};
         for (int i = 0; i < 120 * 5; i++)
             {
             if (access(startFile.c_str(), F_OK) == 0)
@@ -399,7 +397,7 @@ switch (stgChildPid)
                 unlink(startFile.c_str());
                 exit(1);
                 }
-            usleep(200000);
+            nanosleep(&ts, NULL);
             }
         unlink(startFile.c_str());
         exit(1);
@@ -447,7 +445,7 @@ STORE * dataStore = NULL;
 TARIFFS_IMPL * tariffs = NULL;
 ADMINS_IMPL * admins = NULL;
 USERS_IMPL * users = NULL;
-TRAFFCOUNTER * traffCnt = NULL;
+TRAFFCOUNTER_IMPL * traffCnt = NULL;
 int msgID = -11;
 
     {
@@ -544,7 +542,7 @@ WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion()
 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 = new TRAFFCOUNTER_IMPL(users, settings->GetRulesFileName());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 modSettings = settings->GetModulesSettings();
@@ -623,11 +621,11 @@ srandom(stgTime);
  *
  * (c) man 2 nice
  */
-errno = 0;
+/*errno = 0;
 if (nice(-19) && errno) {
     printfd(__FILE__, "nice failed: '%s'\n", strerror(errno));
     WriteServLog("nice failed: '%s'", strerror(errno));
-}
+}*/
 
 WriteServLog("Stg started successfully.");
 WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");