pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-26 01:46:39 +02:00
Code Activity

Fork earlier in startup to prevent it messing up threads, if there are any

Browse Source
This commit is contained in:
Adam
2011-10-14 22:07:13 -04:00
parent 2504af7d0f
commit 28ca0e1007
4 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/init.cpp
+51 -15
View File
@@ -158,16 +158,10 @@ static void remove_pidfile()
static void write_pidfile()
{
FILE *pidfile;
pidfile = fopen(Config->PIDFilename.c_str(), "w");
FILE *pidfile = fopen(Config->PIDFilename.c_str(), "w");
if (pidfile)
{
#ifdef _WIN32
fprintf(pidfile, "%d\n", static_cast<int>(GetCurrentProcessId()));
#else
fprintf(pidfile, "%d\n", static_cast<int>(getpid()));
#endif
fclose(pidfile);
atexit(remove_pidfile);
}
@@ -239,11 +233,7 @@ bool AtTerm()
void Fork()
{
#ifndef _WIN32
int i = fork();
if (i < 0)
Log(LOG_TERMINAL) << "Unable to fork, " << Anope::LastError();
else if (i != 0)
exit(0);
kill(getppid(), SIGUSR2);
if (isatty(fileno(stdout)))
fclose(stdout);
@@ -258,6 +248,32 @@ void Fork()
#endif
}
#ifndef _WIN32
class SignalForkExit : public Signal
{
public:
SignalForkExit() : Signal(SIGUSR2) { }
void OnNotify()
{
exit(0);
}
};
class SignalSigChld : public Signal
{
public:
SignalSigChld() : Signal(SIGCHLD) { }
void OnNotify()
{
int status = 0;
wait(&status);
exit(status);
}
};
#endif
void Init(int ac, char **av)
{
/* Set file creation mask and group ID. */
@@ -356,6 +372,9 @@ void Init(int ac, char **av)
throw FatalException("Unable to chdir to " + services_dir + ": " + Anope::LastError());
}
/* Initialize the socket engine */
SocketEngine::Init();
init_core_messages();
Log(LOG_TERMINAL) << "Anope " << Anope::Version() << ", " << Anope::VersionBuildString();
@@ -380,17 +399,34 @@ void Init(int ac, char **av)
throw FatalException("Configuration file failed to validate");
}
/* Initialize the socket engine */
SocketEngine::Init();
/* Create me */
Me = new Server(NULL, Config->ServerName, 0, Config->ServerDesc, Config->Numeric);
#ifdef _WIN32
if (!SupportedWindowsVersion())
throw FatalException(GetWindowsVersion() + " is not a supported version of Windows");
#else
if (!nofork)
{
int i = fork();
if (i > 0)
{
new SignalForkExit();
new SignalSigChld();
while (!quitting)
{
Log(LOG_DEBUG_3) << "Top of fork() process loop";
SocketEngine::Process();
}
/* Should not be reached */
exit(-1);
}
else if (i == -1)
Log() << "Error, unable to fork: " << Anope::LastError();
}
#endif
/* Write our PID to the PID file. */
write_pidfile();