/[monit]/monit/validate.c
ViewVC logotype

Diff of /monit/validate.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.26 by rory, Tue Dec 3 23:20:28 2002 UTC revision 1.27 by martinp, Sun Dec 15 18:17:31 2002 UTC
# Line 275  static void do_restart(Process_T p, char Line 275  static void do_restart(Process_T p, char
275    va_list ap;    va_list ap;
276    char *tmp = NULL;    char *tmp = NULL;
277    
278    if(!p->start || !p->stop || !p->do_validate)    if(!p->do_validate)
279      return;      return;
280    
281      if(p->def_timeout)
282        p->nstart++;
283    
284    va_start(ap, m);    va_start(ap, m);
285    if(m)    if(m)
286      tmp=format(m, ap);      tmp=format(m, ap);
287    va_end(ap);    va_end(ap);
288    
289    if(p->mode!= MODE_PASSIVE) {    if( p->mode!= MODE_PASSIVE && (p->start || p->stop) ) {
290    
291      log("Trying to restart '%s'\n", p->name);      log("Trying to restart '%s'\n", p->name);
292    
293      check_process(p->name, "stop", FALSE);      check_process(p->name, "stop", FALSE);
294    
295      sleep(10); /* Wait for process termination */      sleep(10); /* Wait for process termination */
296    
297    }      check_process(p->name, "start", FALSE);
298    
299    do_start(p, "%s", tmp);      /* In the case we just started our own smtp server we'll
300         * sleep before attempting to send alert */
301        sleep(3);
302    
303        smtp_alert_restart(p, "%s", tmp);
304    
305      } else {
306    
307        smtp_alert_failed(p, "%s", tmp);
308    
309      }
310    
311    free(tmp);    free(tmp);
312    
# Line 308  static void do_start(Process_T p, char * Line 322  static void do_start(Process_T p, char *
322    va_list ap;    va_list ap;
323    char *tmp = NULL;    char *tmp = NULL;
324    
325    if( !p->start || !p->do_validate )    if(!p->do_validate)
326      return;      return;
327    
328    if(p->def_timeout)    if(p->def_timeout)
# Line 320  static void do_start(Process_T p, char * Line 334  static void do_start(Process_T p, char *
334      tmp=format(m, ap);      tmp=format(m, ap);
335    va_end(ap);    va_end(ap);
336    
337    if(p->mode!= MODE_PASSIVE) {    if(p->mode!= MODE_PASSIVE && p->start) {
338    
339      /* Start process and take care of dependants */      /* Start process and take care of dependants */
340      check_process(p->name, "start", FALSE);      check_process(p->name, "start", FALSE);
# Line 351  static void do_stop(Process_T p, char *m Line 365  static void do_stop(Process_T p, char *m
365    va_list ap;    va_list ap;
366    char *tmp = NULL;    char *tmp = NULL;
367    
368    if( !p->stop || !p->do_validate )    if(!p->do_validate)
369      return;      return;
370    
371    /* Stop alert */    /* Stop alert */
# Line 364  static void do_stop(Process_T p, char *m Line 378  static void do_stop(Process_T p, char *m
378      p->do_validate= FALSE;      p->do_validate= FALSE;
379    END_LOCK;    END_LOCK;
380    
381    if(p->mode!= MODE_PASSIVE) {    if(p->mode!= MODE_PASSIVE && p->stop) {
382    
383      smtp_alert_stop(p, "%s", tmp);      smtp_alert_stop(p, "%s", tmp);
384    

Legend:
Removed from v.1.26  
changed lines
  Added in v.1.27

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26