X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0f40a5daeee669d12c789e4ffb0c537358c17fab..2ea67b39f9cade2b55cfbbd554af1049c1c69fd9:/projects/stargazer/main.cpp?ds=sidebyside diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index 64d1cda2..3839ae8e 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -35,6 +35,7 @@ #include #include #include +#include // srandom, exit #include #include #include @@ -53,6 +54,8 @@ #include "users_impl.h" #include "admins_impl.h" #include "tariffs_impl.h" +#include "services_impl.h" +#include "corps_impl.h" #include "traffcounter_impl.h" #include "plugin_runner.h" #include "store_loader.h" @@ -60,7 +63,6 @@ #include "eventloop.h" using namespace std; -uint32_t eip; #ifdef DEBUG #define MAIN_DEBUG (1) @@ -69,12 +71,7 @@ uint32_t eip; #define START_FILE "/._ST_ART_ED_" -static bool needRulesReloading = false; -static bool childExited = false; -//static pid_t executerPid; set executersPid; -static pid_t stgChildPid; - //----------------------------------------------------------------------------- bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs) @@ -87,28 +84,6 @@ bool StopModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs) return lhs.GetStopPosition() > rhs.GetStopPosition(); } //----------------------------------------------------------------------------- -class STG_STOPPER -{ -public: - STG_STOPPER() { nonstop = true; } - bool GetStatus() const { return nonstop; }; - #ifdef NO_DAEMON - void Stop(const char * __file__, int __line__) - #else - void Stop(const char *, int) - #endif - { - #ifdef NO_DAEMON - printfd(__FILE__, "Stg stopped at %s:%d\n", __file__, __line__); - #endif - nonstop = false; - } -private: - bool nonstop; -}; -//----------------------------------------------------------------------------- -STG_STOPPER nonstop; -//----------------------------------------------------------------------------- static void StartTimer() { STG_LOGGER & WriteServLog = GetStgLogger(); @@ -126,185 +101,6 @@ else } } //----------------------------------------------------------------------------- -void CatchUSR1(int) -{ - -} -//----------------------------------------------------------------------------- -void CatchTERM(int sig) -{ -/* - *Function Name:CatchINT - *Parameters: sig_num - ÎÏÍÅÒ ÓÉÇÎÁÌÁ - *Description: ïÂÒÁÂÏÔÞÉË ÓÉÇÎÁÌÁ INT - *Returns: îÉÞÅÇÏ - */ -STG_LOGGER & WriteServLog = GetStgLogger(); -WriteServLog("Shutting down... %d", sig); - -//nonstop = false; -nonstop.Stop(__FILE__, __LINE__); - -struct sigaction newsa, oldsa; -sigset_t sigmask; - -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGTERM); -newsa.sa_handler = SIG_IGN; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGTERM, &newsa, &oldsa); - -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGINT); -newsa.sa_handler = SIG_IGN; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGINT, &newsa, &oldsa); -} -//----------------------------------------------------------------------------- -void CatchPIPE(int) -{ -STG_LOGGER & WriteServLog = GetStgLogger(); -WriteServLog("Broken pipe!"); -} -//----------------------------------------------------------------------------- -void CatchHUP(int) -{ -needRulesReloading = true; -} -//----------------------------------------------------------------------------- -void CatchCHLD(int) -{ -int status; -pid_t childPid; -childPid = waitpid(-1, &status, WNOHANG); - -set::iterator pid; -pid = executersPid.find(childPid); -if (pid != executersPid.end()) - { - executersPid.erase(pid); - if (executersPid.empty() && nonstop.GetStatus()) - { - nonstop.Stop(__FILE__, __LINE__); - } - } -if (childPid == stgChildPid) - { - childExited = true; - } -} -/*//----------------------------------------------------------------------------- -void CatchSEGV(int, siginfo_t *, void *) -{ -char fileName[50]; -sprintf(fileName, "/tmp/stg_segv.%d", getpid()); -FILE * f = fopen(fileName, "wt"); -if (f) - { - fprintf(f, "\nSignal info:\n~~~~~~~~~~~~\n"); - fprintf(f, "numb:\t %d (%d)\n", sinfo->si_signo, sig); - fprintf(f, "errn:\t %d\n", sinfo->si_errno); - fprintf(f, "code:\t %d ", sinfo->si_code); - - switch (sinfo->si_code) - { - case SEGV_MAPERR: - fprintf(f, "(SEGV_MAPERR - address not mapped to object)\n"); - break; - - case SEGV_ACCERR: - fprintf(f, "(SEGV_ACCERR - invalid permissions for mapped object)\n"); - break; - - default: - fprintf(f, "???\n"); - } - - fprintf(f, "addr:\t 0x%.8X\n", - (unsigned int)sinfo->si_addr); - - Dl_info dlinfo; - //asm("movl %eip, eip"); - if (dladdr((void*)CatchCHLD, &dlinfo)) - { - fprintf(f, "SEGV point: %s %s\n", dlinfo.dli_fname, dlinfo.dli_sname); - } - else - { - fprintf(f, "Cannot find SEGV point\n"); - } - - fclose(f); - } - -struct sigaction segv_action, segv_action_old; - -segv_action.sa_handler = SIG_DFL; -segv_action.sa_sigaction = NULL; -segv_action.sa_flags = SA_SIGINFO; -segv_action.sa_restorer = NULL; - -sigaction(SIGSEGV, &segv_action, &segv_action_old); -}*/ -//----------------------------------------------------------------------------- -static void SetSignalHandlers() -{ -struct sigaction newsa, oldsa; -sigset_t sigmask; -/////// -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGTERM); -newsa.sa_handler = CatchTERM; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGTERM, &newsa, &oldsa); -/////// -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGUSR1); -newsa.sa_handler = CatchUSR1; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGUSR1, &newsa, &oldsa); -/////// -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGINT); -newsa.sa_handler = CatchTERM; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGINT, &newsa, &oldsa); -////// -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGPIPE); -newsa.sa_handler = CatchPIPE; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGPIPE, &newsa, &oldsa); -////// -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGHUP); -newsa.sa_handler = CatchHUP; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGHUP, &newsa, &oldsa); -////// -sigemptyset(&sigmask); -sigaddset(&sigmask, SIGCHLD); -newsa.sa_handler = CatchCHLD; -newsa.sa_mask = sigmask; -newsa.sa_flags = 0; -sigaction(SIGCHLD, &newsa, &oldsa); - -/*newsa.sa_handler = NULL; -newsa.sa_sigaction = CatchSEGV; -newsa.sa_flags = SA_SIGINFO; -newsa.sa_restorer = NULL; -sigaction(SIGSEGV, &newsa, &oldsa);*/ - -return; -} -//----------------------------------------------------------------------------- int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings) { STG_LOGGER & WriteServLog = GetStgLogger(); @@ -346,12 +142,12 @@ switch (executerPid) case 0: delete settings; - Executer(msgKey, *msgID, executerPid, procName); + Executer(*msgID, executerPid, procName); return 1; default: if (executersPid.empty()) { - Executer(msgKey, *msgID, executerPid, NULL); + Executer(*msgID, executerPid, NULL); } executersPid.insert(executerPid); } @@ -391,11 +187,6 @@ switch (stgChildPid) exit(0); } - if (childExited) - { - unlink(startFile.c_str()); - exit(1); - } nanosleep(&ts, NULL); } unlink(startFile.c_str()); @@ -420,31 +211,14 @@ while (pid != executersPid.end()) //----------------------------------------------------------------------------- int main(int argc, char * argv[]) { - -/* - Initialization order: - - Logger - - Stg timer - - Settings - - Plugins - - Plugins settings - - Read Admins - - Read Tariffs - - Read Users - - Start Users - - Start Traffcounter - - Start Plugins - - Start pinger - - Set signal nandlers - - Fork and exit - * */ - SETTINGS_IMPL * settings = NULL; STORE * dataStore = 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; { @@ -512,6 +286,10 @@ for (size_t i = 0; i < settings->GetExecutersNum(); i++) PIDFile pidFile(settings->GetPIDFileName()); +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + StartTimer(); WaitTimer(); if (!IsStgTimerRunning()) @@ -542,6 +320,8 @@ tariffs = new TARIFFS_IMPL(dataStore); admins = new ADMINS_IMPL(dataStore); 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(); @@ -559,6 +339,8 @@ for (size_t i = 0; i < modSettings.size(); i++) admins, tariffs, users, + services, + corps, traffCnt, dataStore, settings) @@ -569,7 +351,6 @@ modIter = modules.begin(); while (modIter != modules.end()) { - //Loading modules if (modIter->Load()) { WriteServLog("Error: %s", @@ -579,7 +360,6 @@ while (modIter != modules.end()) ++modIter; } -//Start section if (users->Start()) { goto exitLblNotStarted; @@ -602,30 +382,14 @@ while (modIter != modules.end()) { WriteServLog("Error: %s", modIter->GetStrError().c_str()); - //printfd(__FILE__, "Error: %s\n", capRunner.GetStrError().c_str()); goto exitLbl; } WriteServLog("Module: '%s'. Start successfull.", modIter->GetPlugin()->GetVersion().c_str()); ++modIter; } -SetSignalHandlers(); srandom(stgTime); -/* - * Note that an implementation in which nice returns the new nice value - * can legitimately return -1. To reliably detect an error, set - * errno to 0 before the call, and check its value when nice returns -1. - * - * - * (c) man 2 nice - */ -/*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("+++++++++++++++++++++++++++++++++++++++++++++"); @@ -633,26 +397,57 @@ WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++"); creat(startFile.c_str(), S_IRUSR); #endif -while (nonstop.GetStatus()) +while (true) { - if (needRulesReloading) + sigfillset(&signalSet); + int sig = 0; + sigwait(&signalSet, &sig); + bool stop = false; + int status; + pid_t childPid; + set::iterator it; + switch (sig) { - needRulesReloading = false; - traffCnt->Reload(); + case SIGHUP: + traffCnt->Reload(); + modIter = modules.begin(); + for (; modIter != modules.end(); ++modIter) + { + if (modIter->Reload()) + { + WriteServLog("Error reloading %s ('%s')", modIter->GetPlugin()->GetVersion().c_str(), + modIter->GetStrError().c_str()); + printfd(__FILE__, "Error reloading %s ('%s')\n", modIter->GetPlugin()->GetVersion().c_str(), + modIter->GetStrError().c_str()); + } + } + break; + case SIGTERM: + stop = true; + break; + case SIGINT: + stop = true; + break; + case SIGPIPE: + WriteServLog("Broken pipe!"); + break; + case SIGCHLD: + childPid = waitpid(-1, &status, WNOHANG); - modIter = modules.begin(); - for (; modIter != modules.end(); ++modIter) - { - if (modIter->Reload()) + it = executersPid.find(childPid); + if (it != executersPid.end()) { - WriteServLog("Error reloading %s ('%s')", modIter->GetPlugin()->GetVersion().c_str(), - modIter->GetStrError().c_str()); - printfd(__FILE__, "Error reloading %s ('%s')\n", modIter->GetPlugin()->GetVersion().c_str(), - modIter->GetStrError().c_str()); + executersPid.erase(it); + if (executersPid.empty()) + stop = true; } - } + break; + default: + WriteServLog("Ignore signel %d", sig); + break; } - stgUsleep(100000); + if (stop) + break; } exitLbl: @@ -672,8 +467,6 @@ while (modIter != modules.end()) modIter->GetPlugin()->GetVersion().c_str(), modIter->GetStrError().c_str()); printfd(__FILE__, "Failed to stop module '%s'\n", name.c_str()); - //printfd(__FILE__, "Error: %s\n", capRunner.GetStrError().c_str()); - //goto exitLbl; } WriteServLog("Module: \'%s\'. Stop successfull.", modIter->GetPlugin()->GetVersion().c_str()); ++modIter; @@ -690,13 +483,20 @@ modIter = modules.begin(); while (modIter != modules.end()) { std::string name = modIter->GetFileName(); - printfd(__FILE__, "Unloading module '%s'\n", name.c_str()); - if (modIter->Unload()) + if (modIter->IsRunning()) { - WriteServLog("Module \'%s\': Error: %s", - name.c_str(), - modIter->GetStrError().c_str()); - printfd(__FILE__, "Failed to unload module '%s'\n", name.c_str()); + printfd(__FILE__, "Passing module '%s' `cause it's still running\n", name.c_str()); + } + else + { + printfd(__FILE__, "Unloading module '%s'\n", name.c_str()); + if (modIter->Unload()) + { + WriteServLog("Module \'%s\': Error: %s", + name.c_str(), + modIter->GetStrError().c_str()); + printfd(__FILE__, "Failed to unload module '%s'\n", name.c_str()); + } } ++modIter; } @@ -725,6 +525,8 @@ KillExecuters(); StopStgTimer(); WriteServLog("StgTimer: Stop successfull."); +delete corps; +delete services; delete traffCnt; delete users; delete admins;