hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into LTS_development

Browse source
This commit is contained in:
Thulinma 2018-12-13 16:48:52 +01:00
commit e18f2f0b47
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/procs.cpp
View file

@ -65,6 +65,7 @@ bool Util::Procs::isRunning(pid_t pid){
/// After that waits up to 5 seconds for children to exit, then sends SIGKILL to /// After that waits up to 5 seconds for children to exit, then sends SIGKILL to
/// all remaining children. Waits one more second for cleanup to finish, then exits. /// all remaining children. Waits one more second for cleanup to finish, then exits.
void Util::Procs::exit_handler() { void Util::Procs::exit_handler() {
if (!handler_set){return;}
int waiting = 0; int waiting = 0;
std::set<pid_t> listcopy; std::set<pid_t> listcopy;
{ {
@ -319,6 +320,7 @@ pid_t Util::Procs::StartPiped(const char * const * argv, int * fdin, int * fdout
} }
pid = fork(); pid = fork();
if (pid == 0) { //child if (pid == 0) { //child
handler_set = false;
//Close all sockets in the socketList //Close all sockets in the socketList
for (std::set<int>::iterator it = Util::Procs::socketList.begin(); it != Util::Procs::socketList.end(); ++it){ for (std::set<int>::iterator it = Util::Procs::socketList.begin(); it != Util::Procs::socketList.end(); ++it){
close(*it); close(*it);