News for hackers. Stuff that matters.
Re:Notqmail: Collaborative open-source successor to qmail by 3xblah on Monday July 29, 2019 @04:58AM (#20552699)

   diff -Nur admin.orig/daemontools-0.76/src/supervise.c admin/daemontools-0.76/src/supervise.c
   --- admin.orig/daemontools-0.76/src/supervise.c 2010-02-19 11:08:15.000000000 +0100
   +++ admin/daemontools-0.76/src/supervise.c 2010-02-19 12:53:16.000000000 +0100
   @@ -86,6 +86,8 @@
    
    const char *run[2] = { "./run", 0 };
    
   +int flagfailed = 0;
   +
    void trystart(void)
    {
      int f;
   @@ -94,6 +96,7 @@
        case -1:
          strerr_warn4(WARNING,"unable to fork for ",dir,", sleeping 60 seconds: ",&strerr_sys);
          deepsleep(60);
   +      flagfailed = 1;
          trigger();
          return;
        case 0:
   @@ -153,6 +156,11 @@
          }
        }
    
   +    if (flagfailed && flagwant && flagwantup){
   +      flagfailed = 0;
   +      trystart();
   +    }
   +
        if (read(fdcontrol,&ch,1) == 1)
          switch(ch) {
    case 'd':
   diff -Nur admin.orig/daemontools-0.76/src/supervise.c admin/daemontools-0.76/src/supervise.c
   --- admin.orig/daemontools-0.76/src/supervise.c 2001-07-12 18:49:49.000000000 +0200
   +++ admin/daemontools-0.76/src/supervise.c 2012-12-23 21:54:20.437771704 +0100
   @@ -97,6 +97,8 @@
          trigger();
          return;
        case 0:
   +      setsid();
   +      setpgid(0,0);
          sig_uncatch(sig_child);
          sig_unblock(sig_child);
          execve(*run,run,environ);
   @@ -158,7 +160,7 @@
    case 'd':
      flagwant = 1;
      flagwantup = 0;
   -  if (pid) { kill(pid,SIGTERM); kill(pid,SIGCONT); flagpaused = 0; }
   +  if (pid) { killpg(pid,SIGTERM); killpg(pid,SIGCONT); flagpaused = 0; }
      announce();
      break;
    case 'u':
   @@ -173,29 +175,29 @@
      if (!pid) trystart();
      break;
    case 'a':
   -  if (pid) kill(pid,SIGALRM);
   +  if (pid) killpg(pid,SIGALRM);
      break;
    case 'h':
   -  if (pid) kill(pid,SIGHUP);
   +  if (pid) killpg(pid,SIGHUP);
      break;
    case 'k':
   -  if (pid) kill(pid,SIGKILL);
   +  if (pid) killpg(pid,SIGKILL);
      break;
    case 't':
   -  if (pid) kill(pid,SIGTERM);
   +  if (pid) killpg(pid,SIGTERM);
      break;
    case 'i':
   -  if (pid) kill(pid,SIGINT);
   +  if (pid) killpg(pid,SIGINT);
      break;
    case 'p':
      flagpaused = 1;
      announce();
   -  if (pid) kill(pid,SIGSTOP);
   +  if (pid) killpg(pid,SIGSTOP);
      break;
    case 'c':
      flagpaused = 0;
      announce();
   -  if (pid) kill(pid,SIGCONT);
   +  if (pid) killpg(pid,SIGCONT);
      break;
    case 'x':
      flagexit = 1;
Re:Notqmail: Collaborative open-source successor to qmail by knowsmorsecode on Monday July 29, 2019 @09:31AM (#20554384)
Why killpg?
Re:Notqmail: Collaborative open-source successor to qmail by 693471 on Monday July 29, 2019 @09:51PM (#20561384)
I suspect to kill all children and not rely on the parent you're supervising to clean up.