$Author: faust $
*/
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
#include <unistd.h>
#include <sys/ipc.h>
#include <sys/msg.h>
-#include <sys/stat.h>
+#include <sys/types.h>
#include <sys/wait.h>
-#include <dlfcn.h>
-#include <signal.h>
-#include <fcntl.h>
+#include <sys/stat.h> // S_IRUSR
+#include <fcntl.h> // create
+#include <csignal>
+#include <cerrno>
+#include <cstdio>
#include <fstream>
#include <vector>
#include <set>
#include <list>
-#include "settings.h"
-#include "user.h"
-#include "users.h"
-#include "admins.h"
-#include "common.h"
-#include "traffcounter.h"
-#include "base_plugin.h"
-#include "stg_logger.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 "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"
set<pid_t> executersPid;
static pid_t stgChildPid;
-#include "pinger.h"
//-----------------------------------------------------------------------------
bool StartModCmp(const PLUGIN_RUNNER & lhs, const PLUGIN_RUNNER & rhs)
{
public:
STG_STOPPER() { nonstop = true; }
- bool GetStatus() { return nonstop; };
+ bool GetStatus() const { return nonstop; };
#ifdef NO_DAEMON
void Stop(const char * __file__, int __line__)
#else
}
}
//-----------------------------------------------------------------------------
-void CatchPROF(int)
-{
-/*STG_LOGGER & WriteServLog = GetStgLogger();
-WriteServLog("CatchPROF");*/
-}
-//-----------------------------------------------------------------------------
void CatchUSR1(int)
{
childExited = true;
}
}
-//-----------------------------------------------------------------------------
+/*//-----------------------------------------------------------------------------
void CatchSEGV(int, siginfo_t *, void *)
{
-/*char fileName[50];
+char fileName[50];
sprintf(fileName, "/tmp/stg_segv.%d", getpid());
FILE * f = fopen(fileName, "wt");
if (f)
segv_action.sa_flags = SA_SIGINFO;
segv_action.sa_restorer = NULL;
-sigaction(SIGSEGV, &segv_action, &segv_action_old);*/
-}
+sigaction(SIGSEGV, &segv_action, &segv_action_old);
+}*/
//-----------------------------------------------------------------------------
static void SetSignalHandlers()
{
newsa.sa_mask = sigmask;
newsa.sa_flags = 0;
sigaction(SIGINT, &newsa, &oldsa);
-/*///////
-sigemptyset(&sigmask);
-sigaddset(&sigmask, SIGPROF);
-newsa.sa_handler = CatchPROF;
-newsa.sa_mask = sigmask;
-newsa.sa_flags = 0;
-sigaction(SIGPROF, &newsa, &oldsa);*/
//////
sigemptyset(&sigmask);
sigaddset(&sigmask, SIGPIPE);
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();
{
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)
else
{
msgctl(*msgID, IPC_RMID, NULL);
- //printfd(__FILE__, "Queue removed!");
}
}
else
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);
return 1;
- default: // ïÓÎÏ×ÎÏÊ ÐÒÏÃÅÓÓ
+ default:
if (executersPid.empty()) {
Executer(msgKey, *msgID, executerPid, NULL);
}
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);
}
unlink(startFile.c_str());
exit(1);
}
- usleep(200000);
+ nanosleep(&ts, NULL);
}
unlink(startFile.c_str());
exit(1);
- Fork and exit
* */
-SETTINGS * settings = NULL;
-BASE_STORE * dataStore = NULL;
-TARIFFS * tariffs = NULL;
-ADMINS * admins = NULL;
-USERS * users = NULL;
-TRAFFCOUNTER * traffCnt = NULL;
+SETTINGS_IMPL * settings = NULL;
+STORE * dataStore = NULL;
+TARIFFS_IMPL * tariffs = NULL;
+ADMINS_IMPL * admins = NULL;
+USERS_IMPL * users = NULL;
+TRAFFCOUNTER_IMPL * traffCnt = NULL;
int msgID = -11;
{
}
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() != "")
string startFile(settings->GetConfDir() + START_FILE);
#endif
-//SetSignalHandlers();
if (ForkAndWait(settings->GetConfDir()) < 0)
{
STG_LOGGER & WriteServLog = GetStgLogger();
WriteServLog.SetLogFileName(settings->GetLogFileName());
WriteServLog("Stg v. %s", SERVER_VERSION);
-for (int i = 0; i < settings->GetExecutersNum(); i++)
+for (size_t i = 0; i < settings->GetExecutersNum(); i++)
{
int ret = StartScriptExecuter(argv[0], settings->GetExecMsgKey(), &msgID, settings);
if (ret < 0)
{
STG_LOGGER & WriteServLog = GetStgLogger();
WriteServLog("Start Script Executer error!");
- //goto exitLbl;
return 1;
}
if (ret == 1)
dataStore = storeLoader.GetStore();
WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion().c_str());
-tariffs = new TARIFFS(dataStore);
-admins = new ADMINS(dataStore);
-users = new USERS(settings, dataStore, tariffs, admins->GetSysAdmin());
-traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
+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());
traffCnt->SetMonitorDir(settings->GetMonitorDir());
-//tariffs->SetUsers(users);
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_";
//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();
creat(startFile.c_str(), S_IRUSR);
#endif
-//*a_kill_it = 0;
-
while (nonstop.GetStatus())
{
if (needRulesReloading)
exitLblNotStarted:
-/*modIter = modules.begin();
+modIter = modules.begin();
while (modIter != modules.end())
{
std::string name = modIter->GetFileName();
printfd(__FILE__, "Failed to unload module '%s'\n", name.c_str());
}
++modIter;
- }*/
+ }
if (traffCnt)
{
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 traffCnt;
delete users;
delete admins;
delete tariffs;
delete settings;
+WriteServLog("Stg stopped successfully.");
+WriteServLog("---------------------------------------------");
+
return 0;
}
//-----------------------------------------------------------------------------
-
-
git.stg.codes / stg.git / blobdiff