PIDFile pidFile(settings.GetPIDFileName());
+struct sigaction sa;
+memset(&sa, 0, sizeof(sa));
+sa.sa_handler = SIG_DFL;
+sigaction(SIGHUP, &sa, NULL); // Apparently FreeBSD ignores SIGHUP by default when launched from rc.d at bot time.
+
sigset_t signalSet;
sigfillset(&signalSet);
pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
{
SETTINGS_IMPL newSettings(settings);
if (newSettings.ReadSettings())
- {
- STG_LOGGER & WriteServLog = GetStgLogger();
-
- if (newSettings.GetLogFileName() != "")
- WriteServLog.SetLogFileName(newSettings.GetLogFileName());
-
WriteServLog("ReadSettings error. %s", newSettings.GetStrError().c_str());
- return -1;
- }
- settings = newSettings;
+ else
+ settings = newSettings;
+ WriteServLog.SetLogFileName(settings.GetLogFileName());
traffCnt.Reload();
- manager.reload();
+ manager.reload(settings);
}
break;
case SIGTERM:
WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++");
+manager.stop();
+
if (loop.Stop())
WriteServLog("Event loop not stopped.");