X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/5f488a67d8dae833dcd29b65804abf7904a90a86..ad32e2b6fbd75d8f77b2e9ca2f4d3bee0ad269de:/projects/stargazer/main.cpp?ds=sidebyside diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp index 860800f8..702bfb86 100644 --- a/projects/stargazer/main.cpp +++ b/projects/stargazer/main.cpp @@ -266,6 +266,11 @@ for (size_t i = 0; i < settings.GetExecutersNum(); i++) 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); @@ -341,18 +346,12 @@ while (running) { 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: @@ -377,6 +376,8 @@ while (running) WriteServLog("+++++++++++++++++++++++++++++++++++++++++++++"); +manager.stop(); + if (loop.Stop()) WriteServLog("Event loop not stopped.");