-rw-r--r-- | src/dudki.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/dudki.cc b/src/dudki.cc index b769109..b4e95a7 100644 --- a/src/dudki.cc +++ b/src/dudki.cc | |||
@@ -16,25 +16,26 @@ using namespace std; | |||
16 | #ifndef DEFAULT_CONF_FILE | 16 | #ifndef DEFAULT_CONF_FILE |
17 | # define DEFAULT_CONF_FILE "/etc/dudki.conf" | 17 | # define DEFAULT_CONF_FILE "/etc/dudki.conf" |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #define PHEADER PACKAGE " Version " VERSION | 20 | #define PHEADER PACKAGE " Version " VERSION |
21 | #define PCOPY "Copyright (c) 2004 Klever Group" | 21 | #define PCOPY "Copyright (c) 2004 Klever Group" |
22 | 22 | ||
23 | bool finishing = false; | 23 | bool finishing = false; |
24 | bool restarting = false; | ||
24 | static char **_argv = NULL; | 25 | static char **_argv = NULL; |
25 | 26 | ||
26 | static void lethal_signal_handler(int signum) { | 27 | static void lethal_signal_handler(int signum) { |
27 | syslog(LOG_NOTICE,"Lethal signal received. Terminating."); | 28 | syslog(LOG_NOTICE,"Lethal signal received. Terminating."); |
28 | finishing = true; | 29 | finishing = true; |
29 | } | 30 | } |
30 | static void sighup_handler(int signum) { | 31 | static void sighup_handler(int signum) { |
31 | syslog(LOG_NOTICE,"SUGHUP received, reloading."); | 32 | syslog(LOG_NOTICE,"SUGHUP received, reloading."); |
32 | execvp(_argv[0],_argv); | 33 | restarting = finishing = true; |
33 | } | 34 | } |
34 | 35 | ||
35 | void check_herd(configuration& config) { | 36 | void check_herd(configuration& config) { |
36 | for(processes_t::iterator i=config.processes.begin();i!=config.processes.end();++i) | 37 | for(processes_t::iterator i=config.processes.begin();i!=config.processes.end();++i) |
37 | i->second.check(i->first,config); | 38 | i->second.check(i->first,config); |
38 | } | 39 | } |
39 | 40 | ||
40 | void signal_self(const configuration& config,int signum) { | 41 | void signal_self(const configuration& config,int signum) { |
@@ -232,16 +233,18 @@ int main(int argc,char **argv) { | |||
232 | sigemptyset(&sset); | 233 | sigemptyset(&sset); |
233 | sigaddset(&sset,SIGINT); sigaddset(&sset,SIGABRT); | 234 | sigaddset(&sset,SIGINT); sigaddset(&sset,SIGABRT); |
234 | sigaddset(&sset,SIGTERM); sigaddset(&sset,SIGHUP); | 235 | sigaddset(&sset,SIGTERM); sigaddset(&sset,SIGHUP); |
235 | sigprocmask(SIG_UNBLOCK,&sset,NULL); | 236 | sigprocmask(SIG_UNBLOCK,&sset,NULL); |
236 | while(!finishing) { | 237 | while(!finishing) { |
237 | check_herd(config); | 238 | check_herd(config); |
238 | sleep(config.check_interval); | 239 | sleep(config.check_interval); |
239 | } | 240 | } |
241 | if(restarting) | ||
242 | execvp(_argv[0],_argv); | ||
240 | } | 243 | } |
241 | break; | 244 | break; |
242 | default: | 245 | default: |
243 | throw runtime_error(string(__PRETTY_FUNCTION__)+": internal error"); | 246 | throw runtime_error(string(__PRETTY_FUNCTION__)+": internal error"); |
244 | } | 247 | } |
245 | }catch(exception& e) { | 248 | }catch(exception& e) { |
246 | cerr << "Oops: " << e.what() << endl; | 249 | cerr << "Oops: " << e.what() << endl; |
247 | return 1; | 250 | return 1; |