git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix stglibs order in sgauth (for --as-needed)
[stg.git]
/
projects
/
stargazer
/
main.cpp
diff --git
a/projects/stargazer/main.cpp
b/projects/stargazer/main.cpp
index 80ec465b709bbeef47a85ae96553c0f53ba80f5b..375823481175b522bdd22a5e06677b3fd6e5f854 100644
(file)
--- a/
projects/stargazer/main.cpp
+++ b/
projects/stargazer/main.cpp
@@
-46,9
+46,7
@@
#include "stg/plugin.h"
#include "stg/logger.h"
#include "stg/scriptexecuter.h"
#include "stg/plugin.h"
#include "stg/logger.h"
#include "stg/scriptexecuter.h"
-#include "stg/conffiles.h"
#include "stg/version.h"
#include "stg/version.h"
-#include "stg/pinger.h"
#include "stg_timer.h"
#include "settings_impl.h"
#include "users_impl.h"
#include "stg_timer.h"
#include "settings_impl.h"
#include "users_impl.h"
@@
-101,7
+99,11
@@
else
}
}
//-----------------------------------------------------------------------------
}
}
//-----------------------------------------------------------------------------
+#ifdef LINUX
int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
int StartScriptExecuter(char * procName, int msgKey, int * msgID, SETTINGS_IMPL * settings)
+#else
+int StartScriptExecuter(char *, int msgKey, int * msgID, SETTINGS_IMPL * settings)
+#endif
{
STG_LOGGER & WriteServLog = GetStgLogger();
{
STG_LOGGER & WriteServLog = GetStgLogger();
@@
-142,12
+144,20
@@
switch (executerPid)
case 0:
delete settings;
case 0:
delete settings;
+#ifdef LINUX
Executer(*msgID, executerPid, procName);
Executer(*msgID, executerPid, procName);
+#else
+ Executer(*msgID, executerPid);
+#endif
return 1;
default:
if (executersPid.empty()) {
return 1;
default:
if (executersPid.empty()) {
+#ifdef LINUX
Executer(*msgID, executerPid, NULL);
Executer(*msgID, executerPid, NULL);
+#else
+ Executer(*msgID, executerPid);
+#endif
}
executersPid.insert(executerPid);
}
}
executersPid.insert(executerPid);
}
@@
-161,11
+171,11
@@
int ForkAndWait(const string &)
#endif
{
#ifndef NO_DAEMON
#endif
{
#ifndef NO_DAEMON
-
stgC
hildPid = fork();
+
pid_t c
hildPid = fork();
string startFile = confDir + START_FILE;
unlink(startFile.c_str());
string startFile = confDir + START_FILE;
unlink(startFile.c_str());
-switch (
stgC
hildPid)
+switch (
c
hildPid)
{
case -1:
return -1;
{
case -1:
return -1;
@@
-286,6
+296,10
@@
for (size_t i = 0; i < settings->GetExecutersNum(); i++)
PIDFile pidFile(settings->GetPIDFileName());
PIDFile pidFile(settings->GetPIDFileName());
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
StartTimer();
WaitTimer();
if (!IsStgTimerRunning())
StartTimer();
WaitTimer();
if (!IsStgTimerRunning())
@@
-393,10
+407,6
@@
WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
creat(startFile.c_str(), S_IRUSR);
#endif
creat(startFile.c_str(), S_IRUSR);
#endif
-sigset_t signalSet;
-sigfillset(&signalSet);
-pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
-
while (true)
{
sigfillset(&signalSet);
while (true)
{
sigfillset(&signalSet);