mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix daemon modes (Aggregator, Listener, Client) 

daemon() must be called prior to set up signal handlers and threads.
This commit is contained in:
Matteo Cypriani 2012-01-24 17:23:06 +01:00
parent cfe58267e3
commit a1bc3db310
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
owlps-aggregator/owlps-aggregatord.c
View File

@ -51,6 +51,14 @@ int main(int argc, char **argv)
if (! owl_run)
goto exit ;
if (cfg_getbool(cfg, "daemon"))
{
if (VERBOSE_WARNING)
fprintf(stderr, "Detaching to background...\n") ;
if (daemon(0, 0))
perror("Cannot daemonize") ;
}
/* Set up signal handlers */
action.sa_flags = 0 ;
sigemptyset(&action.sa_mask) ;
@ -102,14 +110,6 @@ int main(int argc, char **argv)
}
}
if (cfg_getbool(cfg, "daemon"))
{
if (VERBOSE_WARNING)
fprintf(stderr, "Detaching to background...\n") ;
if (daemon(0, 0))
perror("Cannot daemonize") ;
}
ret = read_loop(sockfd) ;
/* Wait for the threads to terminate */

14
owlps-client/owlps-client.c
View File

@ -100,6 +100,13 @@ int main(int argc, char *argv[])
program_name = argv[0] ;
parse_command_line(argc, argv) ;
if (options.daemon)
{
fprintf(stderr, "Detaching to background...\n") ;
if (daemon(0, 0))
perror("Cannot daemonize") ;
}
/* Set up signal handlers */
action.sa_flags = 0 ;
sigemptyset(&action.sa_mask) ;
@ -108,13 +115,6 @@ int main(int argc, char *argv[])
action.sa_handler = owl_sigterm_handler ;
sigaction(SIGTERM, &action, NULL) ;
if (options.daemon)
{
fprintf(stderr, "Detaching to background...\n") ;
if (daemon(0, 0))
perror("Cannot daemonize") ;
}
create_socket() ;
send_request() ;

16
owlps-listener/owlps-listenerd.c
View File

@ -131,6 +131,14 @@ int main(int argc, char *argv[])
if (! owl_run)
goto exit ;
if (GET_DAEMON())
{
if (VERBOSE_WARNING)
fprintf(stderr, "Detaching to background...\n") ;
if (daemon(0, 0))
perror("Cannot daemonize") ;
}
/* Set up signal handlers */
action.sa_flags = 0 ;
sigemptyset(&action.sa_mask) ;
@ -185,14 +193,6 @@ int main(int argc, char *argv[])
}
#endif // USE_PTHREAD
if (GET_DAEMON())
{
if (VERBOSE_WARNING)
fprintf(stderr, "Detaching to background...\n") ;
if (daemon(0, 0))
perror("Cannot daemonize") ;
}
ret = capture() ; // Capture loop
/* Wait for the threads to terminate */