X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/c963a109219ed101fa42f501b16f90d7b7b4f3f2..9eb38c7fb7d4384f82e3ce55071f90ff7d490063:/projects/stargazer/main.cpp diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index 8eacc9ac..7cab078d 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -24,40 +24,40 @@ $Author: faust $ */ -//#include -#include -#include -#include -#include #include #include #include -#include +#include #include -#include -#include +#include // S_IRUSR +#include // create #include #include +#include +#include // srandom, exit #include #include #include #include -#include "settings.h" -#include "user.h" +#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 "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 "services_impl.h" +#include "corps_impl.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 +78,6 @@ static bool childExited = false; set executersPid; static pid_t stgChildPid; -#include "pinger.h" //----------------------------------------------------------------------------- bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs) @@ -309,7 +308,7 @@ sigaction(SIGSEGV, &newsa, &oldsa);*/ return; } //----------------------------------------------------------------------------- -int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS * settings) +int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings) { STG_LOGGER & WriteServLog = GetStgLogger(); @@ -317,7 +316,6 @@ if (*msgID == -11) // If msgID == -11 - first call. Create queue { for (int i = 0; i < 2; i++) { - //WriteServLog("Creating queue with key=%d ...", msgKey); *msgID = msgget(msgKey, IPC_CREAT | IPC_EXCL | 0600); if (*msgID == -1) @@ -331,7 +329,6 @@ if (*msgID == -11) // If msgID == -11 - first call. Create queue else { msgctl(*msgID, IPC_RMID, NULL); - //printfd(__FILE__, "Queue removed!"); } } else @@ -346,22 +343,18 @@ pid_t executerPid = fork(); switch (executerPid) { - case -1: // ìÁÖÁ + case -1: WriteServLog("Fork error!"); return -1; - case 0: // ðÏÔÏÍÏË - //close(0); - //close(1); - //close(2); - //setsid(); + case 0: delete settings; - Executer(msgKey, *msgID, executerPid, procName); + Executer(*msgID, executerPid, procName); return 1; - default: // ïÓÎÏ×ÎÏÊ ÐÒÏÃÅÓÓ + default: if (executersPid.empty()) { - Executer(msgKey, *msgID, executerPid, NULL); + Executer(*msgID, executerPid, NULL); } executersPid.insert(executerPid); } @@ -381,23 +374,22 @@ unlink(startFile.c_str()); switch (stgChildPid) { - case -1: // ìÁÖÁ + case -1: return -1; break; - case 0: // ðÏÔÏÍÏË - //close(0); + case 0: close(1); close(2); setsid(); break; - default: // ïÓÎÏ×ÎÏÊ ÐÒÏÃÅÓÓ + default: + struct timespec ts = {0, 200000000}; for (int i = 0; i < 120 * 5; i++) { if (access(startFile.c_str(), F_OK) == 0) { - //printf("Fork successfull. Exit.\n"); unlink(startFile.c_str()); exit(0); } @@ -407,7 +399,7 @@ switch (stgChildPid) unlink(startFile.c_str()); exit(1); } - usleep(200000); + nanosleep(&ts, NULL); } unlink(startFile.c_str()); exit(1); @@ -450,12 +442,14 @@ int main(int argc, char * argv[]) - Fork and exit * */ -SETTINGS * settings = NULL; +SETTINGS_IMPL * settings = NULL; STORE * dataStore = NULL; -TARIFFS * tariffs = NULL; -ADMINS * admins = NULL; -USERS * users = NULL; -TRAFFCOUNTER * traffCnt = NULL; +TARIFFS_IMPL * tariffs = NULL; +ADMINS_IMPL * admins = NULL; +USERS_IMPL * users = NULL; +TRAFFCOUNTER_IMPL * traffCnt = NULL; +SERVICES_IMPL * services = NULL; +CORPORATIONS_IMPL * corps = NULL; int msgID = -11; { @@ -475,13 +469,12 @@ if (getuid()) } if (argc == 2) - settings = new SETTINGS(argv[1]); + settings = new SETTINGS_IMPL(argv[1]); else - settings = new SETTINGS(); + settings = new SETTINGS_IMPL(); if (settings->ReadSettings()) { - //printfd(__FILE__, "ReadSettings error.\n"); STG_LOGGER & WriteServLog = GetStgLogger(); if (settings->GetLogFileName() != "") @@ -552,13 +545,15 @@ 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()); +users = new USERS_IMPL(settings, dataStore, tariffs, admins->GetSysAdmin()); +traffCnt = new TRAFFCOUNTER_IMPL(users, settings->GetRulesFileName()); +services = new SERVICES_IMPL(dataStore); +corps = new CORPORATIONS_IMPL(dataStore); traffCnt->SetMonitorDir(settings->GetMonitorDir()); modSettings = settings->GetModulesSettings(); -for (unsigned i = 0; i < modSettings.size(); i++) +for (size_t i = 0; i < modSettings.size(); i++) { string modulePath = settings->GetModulesPath(); modulePath += "/mod_"; @@ -571,6 +566,8 @@ for (unsigned i = 0; i < modSettings.size(); i++) admins, tariffs, users, + services, + corps, traffCnt, dataStore, settings) @@ -617,8 +614,7 @@ while (modIter != modules.end()) //printfd(__FILE__, "Error: %s\n", capRunner.GetStrError().c_str()); goto exitLbl; } - WriteServLog("Module: \'%s\'. Start successfull. %d", modIter->GetPlugin()->GetVersion().c_str(), - modIter->GetPlugin()->GetStartPosition()); + WriteServLog("Module: '%s'. Start successfull.", modIter->GetPlugin()->GetVersion().c_str()); ++modIter; } SetSignalHandlers(); @@ -633,11 +629,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("+++++++++++++++++++++++++++++++++++++++++++++"); @@ -733,30 +729,22 @@ if (res) else WriteServLog("Queue removed successfully."); -/*struct sigaction newsa, oldsa; -sigset_t sigmask; -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGCHLD); -newsa.sa_handler = SIG_IGN; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGCHLD, &newsa, &oldsa);*/ - KillExecuters(); StopStgTimer(); WriteServLog("StgTimer: Stop successfull."); -WriteServLog("Stg stopped successfully."); -sleep(1); -WriteServLog("---------------------------------------------"); - +delete corps; +delete services; delete traffCnt; delete users; delete admins; delete tariffs; delete settings; +WriteServLog("Stg stopped successfully."); +WriteServLog("---------------------------------------------"); + return 0; } //-----------------------------------------------------------------------------