Settings code cleaned up

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

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 3ba9ccf376aa93406b72ce3eee75f20480af0845..5f4c7f24c09230a831eaa72edd1770e87752596a 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -43,8 +43,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"


@@ -541,7 +541,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();