-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rw-r--r-- | src/dudki.cc | 5 |
3 files changed, 8 insertions, 2 deletions
@@ -1,2 +1,5 @@ | |||
1 | 0.1 | ||
2 | - initgroups() before executing RestartCommand. | ||
3 | - more civilized restart. | ||
1 | 0.0 | 4 | 0.0 |
2 | - Initial release. | 5 | - Initial release. |
diff --git a/configure.ac b/configure.ac index 8a2a10b..8521a34 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | AC_INIT([dudki], [0.0], [dudki-bugs@klever.net]) | 1 | AC_INIT([dudki], [0.1], [dudki-bugs@klever.net]) |
2 | AC_CONFIG_SRCDIR([src/dudki.cc]) | 2 | AC_CONFIG_SRCDIR([src/dudki.cc]) |
3 | AC_CONFIG_HEADER([config.h]) | 3 | AC_CONFIG_HEADER([config.h]) |
4 | AM_INIT_AUTOMAKE([dist-bzip2]) | 4 | AM_INIT_AUTOMAKE([dist-bzip2]) |
5 | 5 | ||
diff --git a/src/dudki.cc b/src/dudki.cc index b769109..b4e95a7 100644 --- a/src/dudki.cc +++ b/src/dudki.cc | |||
@@ -20,17 +20,18 @@ using namespace std; | |||
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) |
@@ -236,8 +237,10 @@ int main(int argc,char **argv) { | |||
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"); |