Default constructor added for SERVICE_CONF

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 3ba9ccf376aa93406b72ce3eee75f20480af0845..cdaee3b0cb61b3ea54e90c0878cfdfbf4635518c 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -35,6 +35,7 @@
 #include <csignal>
 #include <cerrno>
 #include <cstdio>
 #include <csignal>
 #include <cerrno>
 #include <cstdio>

+#include <cstdlib> // srandom, exit

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


@@ -43,8 +44,8 @@
 #include "stg/user.h"
 #include "stg/common.h"
 #include "stg/plugin.h"
 #include "stg/user.h"
 #include "stg/common.h"
 #include "stg/plugin.h"

-#include "stg/stg_logger.h"
-#include "stg/script_executer.h"
+#include "stg/logger.h"
+#include "stg/scriptexecuter.h"

 #include "stg/conffiles.h"
 #include "stg/version.h"
 #include "stg/pinger.h"
 #include "stg/conffiles.h"
 #include "stg/version.h"
 #include "stg/pinger.h"


@@ -346,12 +347,12 @@ switch (executerPid)
 
     case 0:
         delete settings;
 
     case 0:
         delete settings;

-        Executer(msgKey, *msgID, executerPid, procName);
+        Executer(*msgID, executerPid, procName);

         return 1;
 
     default:
         if (executersPid.empty()) {
         return 1;
 
     default:
         if (executersPid.empty()) {

-            Executer(msgKey, *msgID, executerPid, NULL);
+            Executer(*msgID, executerPid, NULL);

         }
         executersPid.insert(executerPid);
     }
         }
         executersPid.insert(executerPid);
     }


@@ -541,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());
 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 = new TRAFFCOUNTER_IMPL(users, settings->GetRulesFileName());

 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 modSettings = settings->GetModulesSettings();
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 modSettings = settings->GetModulesSettings();


@@ -620,11 +621,11 @@ srandom(stgTime);
  *
  * (c) man 2 nice
  */
  *
  * (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));
 if (nice(-19) && errno) {
     printfd(__FILE__, "nice failed: '%s'\n", strerror(errno));
     WriteServLog("nice failed: '%s'", strerror(errno));

-}
+}*/

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