-rw-r--r-- | src/dudki.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/dudki.cc b/src/dudki.cc index 9562079..c966695 100644 --- a/src/dudki.cc +++ b/src/dudki.cc | |||
@@ -30,18 +30,20 @@ static void lethal_signal_handler(int signum) { | |||
30 | finishing = true; | 30 | finishing = true; |
31 | } | 31 | } |
32 | static void sighup_handler(int signum) { | 32 | static void sighup_handler(int signum) { |
33 | syslog(LOG_NOTICE,"SUGHUP received, reloading."); | 33 | syslog(LOG_NOTICE,"SUGHUP received, reloading."); |
34 | restarting = finishing = true; | 34 | restarting = finishing = true; |
35 | } | 35 | } |
36 | 36 | ||
37 | void check_herd(configuration& config) { | 37 | void check_herd(configuration& config) { |
38 | process::prepare_herd(); | ||
38 | for(processes_t::iterator i=config.processes.begin();i!=config.processes.end();++i) | 39 | for(processes_t::iterator i=config.processes.begin();i!=config.processes.end();++i) |
39 | i->second.check(i->first,config); | 40 | i->second.check(i->first,config); |
41 | process::unprepare_herd(); | ||
40 | } | 42 | } |
41 | 43 | ||
42 | void signal_self(const configuration& config,int signum) { | 44 | void signal_self(const configuration& config,int signum) { |
43 | ifstream pids(config.pidfile.c_str(),ios::in); | 45 | ifstream pids(config.pidfile.c_str(),ios::in); |
44 | if(!pids) | 46 | if(!pids) |
45 | throw runtime_error("Can't detect running instance"); | 47 | throw runtime_error("Can't detect running instance"); |
46 | pid_t pid = 0; | 48 | pid_t pid = 0; |
47 | pids >> pid; | 49 | pids >> pid; |
@@ -215,17 +217,20 @@ int main(int argc,char **argv) { | |||
215 | signal_self(config,op_signum); | 217 | signal_self(config,op_signum); |
216 | }else{ | 218 | }else{ |
217 | int failures = 0; | 219 | int failures = 0; |
218 | for(int narg=optind;narg<argc;narg++) { | 220 | for(int narg=optind;narg<argc;narg++) { |
219 | try { | 221 | try { |
220 | processes_t::const_iterator i = config.processes.find(argv[narg]); | 222 | processes_t::const_iterator i = config.processes.find(argv[narg]); |
221 | if(i==config.processes.end()) | 223 | if(i==config.processes.end()) |
222 | throw runtime_error("no such process configured"); | 224 | throw runtime_error("no such process configured"); |
223 | i->second.signal(op_signum); | 225 | if(op_signum) |
226 | i->second.signal(op_signum); | ||
227 | else | ||
228 | i->second.check(); | ||
224 | }catch(exception& e) { | 229 | }catch(exception& e) { |
225 | cerr << "dudki(" << argv[narg] << "): " << e.what() << endl; | 230 | cerr << "dudki(" << argv[narg] << "): " << e.what() << endl; |
226 | failures++; | 231 | failures++; |
227 | } | 232 | } |
228 | } | 233 | } |
229 | if(failures) | 234 | if(failures) |
230 | throw runtime_error("not all processes have been successfully signaled"); | 235 | throw runtime_error("not all processes have been successfully signaled"); |
231 | } | 236 | } |