retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Supervisor waits up to 30 seconds for child to start. Childrens are reaped 

before starting a new one.


git-svn-id: http://yate.null.ro/svn/yate/trunk@1423 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2007-08-09 10:48:58 +00:00
parent c5bf148fbc
commit b9dd361c2c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engine/Engine.cpp
View File

@ -95,7 +95,7 @@ using namespace TelEngine;
#define CFG_SUFFIX ".conf" #define CFG_SUFFIX ".conf"
#define MAX_SANITY 5 #define MAX_SANITY 5
#define INIT_SANITY 10 #define INIT_SANITY 30
#define MAX_LOGBUFF 4096 #define MAX_LOGBUFF 4096
static u_int64_t s_nextinit = 0; static u_int64_t s_nextinit = 0;
@ -385,6 +385,8 @@ static int supervise(void)
} }
::fcntl(logfd[0],F_SETFL,O_NONBLOCK); ::fcntl(logfd[0],F_SETFL,O_NONBLOCK);
} }
// reap any children we may have before spawning a new one
::waitpid(-1,0,WNOHANG);
s_childpid = ::fork(); s_childpid = ::fork();
if (s_childpid < 0) { if (s_childpid < 0) {
int err = errno; int err = errno;
@ -462,8 +464,6 @@ static int supervise(void)
::usleep(500000); ::usleep(500000);
} }
::kill(s_childpid,SIGKILL); ::kill(s_childpid,SIGKILL);
::usleep(10000);
::waitpid(s_childpid,0,WNOHANG);
s_childpid = -1; s_childpid = -1;
} }
if (s_logrotator) { if (s_logrotator) {
@ -602,7 +602,7 @@ int Engine::run()
#endif #endif
SysUsage::init(); SysUsage::init();
s_runid = Time::secNow(); s_runid = Time::secNow();
Debug(DebugAll,"Engine::run()"); DDebug(DebugAll,"Engine::run()");
install(new EngineStatusHandler); install(new EngineStatusHandler);
loadPlugins(); loadPlugins();
Debug(DebugAll,"Loaded %d plugins",plugins.count()); Debug(DebugAll,"Loaded %d plugins",plugins.count());