X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/12aae76fbeaa3dc91ab5ecad5531a2c1925340d2..bd66b226090397493de8d87649b2bbad3ac89e36:/projects/stargazer/main.cpp diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index 63d5a6b0..6bbd7b9d 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -24,21 +24,17 @@ $Author: faust $ */ -/*#include -#include -#include -#include */ #include #include #include #include #include -/*#include -#include -#include */ +#include // S_IRUSR +#include // create #include #include +#include #include #include #include @@ -50,7 +46,7 @@ #include "admins_impl.h" #include "tariffs_impl.h" #include "common.h" -#include "traffcounter.h" +#include "traffcounter_impl.h" #include "plugin.h" #include "stg_logger.h" #include "stg_timer.h" @@ -386,6 +382,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 +396,7 @@ switch (stgChildPid) unlink(startFile.c_str()); exit(1); } - usleep(200000); + nanosleep(&ts, NULL); } unlink(startFile.c_str()); exit(1); @@ -447,7 +444,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 +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(users, tariffs, settings->GetRulesFileName()); +traffCnt = new TRAFFCOUNTER_IMPL(users, tariffs, settings->GetRulesFileName()); traffCnt->SetMonitorDir(settings->GetMonitorDir()); modSettings = settings->GetModulesSettings();