X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/3379c37a2201e45d840b26ff78c12706ae1c7311..612fd062ef89198e9de7b3b9efdec127aad3a74c:/projects/stargazer/main.cpp diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index 6bbd7b9d..5f4c7f24 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -40,20 +40,21 @@ #include #include +#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_impl.h" -#include "plugin.h" -#include "stg_logger.h" -#include "stg_timer.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" @@ -74,7 +75,6 @@ static bool childExited = false; set executersPid; static pid_t stgChildPid; -#include "pinger.h" //----------------------------------------------------------------------------- bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs) @@ -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()); -traffCnt = new TRAFFCOUNTER_IMPL(users, tariffs, settings->GetRulesFileName()); +traffCnt = new TRAFFCOUNTER_IMPL(users, settings->GetRulesFileName()); traffCnt->SetMonitorDir(settings->GetMonitorDir()); modSettings = settings->GetModulesSettings();