3 files changed, 8 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index efd0c31..b6a3774 100644
--- a/NEWS
+++ b/NEWS
@@ -1,2 +1,5 @@
+0.1
+ - initgroups() before executing RestartCommand.
+ - more civilized restart.
 0.0
  - Initial release.
diff --git a/configure.ac b/configure.ac
index 8a2a10b..8521a34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,38 +1,38 @@
-AC_INIT([dudki], [0.0], [dudki-bugs@klever.net])
+AC_INIT([dudki], [0.1], [dudki-bugs@klever.net])
 AC_CONFIG_SRCDIR([src/dudki.cc])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([dist-bzip2])
 
 AC_PROG_CXX
 AC_PROG_CC
 
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([syslog.h unistd.h getopt.h])
 
 AC_HEADER_STDBOOL
 AC_C_CONST
 AC_TYPE_UID_T
 AC_TYPE_PID_T
 
 AC_FUNC_FORK
 AC_HEADER_STDC
 AC_TYPE_SIGNAL
 AC_CHECK_FUNCS([dup2 strtol])
 AC_CHECK_FUNC([getopt_long],[
  AC_DEFINE([HAVE_GETOPT_LONG],[1],[Define to make use of getopt_long])
  AC_SUBST(HAVE_GETOPT_LONG,1)
 ],[
  AC_SUBST(HAVE_GETOPT_LONG,0)
 ])
 
 PKG_CHECK_MODULES(DOTCONF,[dotconf],,[
  AC_MSG_ERROR([no dotconf library found])
 ])
 
 AC_CONFIG_FILES([
  Makefile
  src/Makefile
  man/Makefile
   man/dudki.8 man/dudki.conf.5
 ])
 AC_OUTPUT
diff --git a/src/dudki.cc b/src/dudki.cc
index b769109..b4e95a7 100644
--- a/src/dudki.cc
+++ b/src/dudki.cc
@@ -1,80 +1,81 @@
 #include <unistd.h>
 #include <signal.h>
 #include <syslog.h>
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
 using namespace std;
 #include "configuration.h"
 #include "util.h"
 
 #include "config.h"
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #endif
 
 #ifndef DEFAULT_CONF_FILE
 # define DEFAULT_CONF_FILE "/etc/dudki.conf"
 #endif
 
 #define PHEADER PACKAGE " Version " VERSION
 #define PCOPY   "Copyright (c) 2004 Klever Group"
 
 bool finishing = false;
+bool restarting = false;
 static char **_argv = NULL;
 
 static void lethal_signal_handler(int signum) {
     syslog(LOG_NOTICE,"Lethal signal received. Terminating.");
     finishing = true;
 }
 static void sighup_handler(int signum) {
     syslog(LOG_NOTICE,"SUGHUP received, reloading.");
-    execvp(_argv[0],_argv);
+    restarting = finishing = true;
 }
 
 void check_herd(configuration& config) {
     for(processes_t::iterator i=config.processes.begin();i!=config.processes.end();++i)
         i->second.check(i->first,config);
 }
 
 void signal_self(const configuration& config,int signum) {
     ifstream pids(config.pidfile.c_str(),ios::in);
     if(!pids)
         throw runtime_error("Can't detect running instance");
     pid_t pid = 0;
     pids >> pid;
     if(!pid)
         throw runtime_error("Can't detect running instance");
     if(pid==getpid())
         throw 0;
     if(kill(pid,signum))
         throw runtime_error("Failed to signal running instance");
 }
 
 int main(int argc,char **argv) {
     try {
         _argv = new char*[argc+1];
         if(!_argv)
             throw runtime_error("memory allocation problem at the very start");
         memmove(_argv,argv,sizeof(*_argv)*(argc+1));
         string config_file = DEFAULT_CONF_FILE;
         enum {
             op_default,
             op_work,
             op_hup,
             op_term,
             op_check,
             op_ensure,
             op_test
         } op = op_default;
         while(true) {
         #defineSHORTOPTSTRING "f:hVLrkcet"
 #ifdef HAVE_GETOPT_LONG
             static struct option opts[] = {
                 { "help", no_argument, 0, 'h' },
                 { "usage", no_argument, 0, 'h' },
                 { "version", no_argument, 0, 'V' },
                 { "license", no_argument, 0, 'L' },
                 { "config", required_argument, 0, 'f' },
                 { "kill", no_argument, 0, 'k' },
                 { "reload", no_argument, 0, 'r' },
@@ -192,58 +193,60 @@ int main(int argc,char **argv) {
             case op_term:
                 signal_self(config,SIGTERM);
                 break;
             case op_check:
                 try{
                     signal_self(config,0);
                     exit(0);
                 }catch(exception& e) {
                     exit(1);
                 }
             case op_ensure:
                 try {
                     signal_self(config,0);
                     break;
                 }catch(exception& e) {
                     syslog(LOG_NOTICE,"The dudki process is down, taking its place");
                     config.daemonize = true;
                 }catch(int zero) {
                     // we throw zero in case we're ensuring that this very process is running.
                     // we don't have to daemonize if we're daemonic.
                     config.daemonize = false;
                 }
             case op_default:
             case op_work:
                 {
                     if(config.daemonize) {
                         pid_t pf = fork();
                         if(pf<0)
                             throw runtime_error(string(__PRETTY_FUNCTION__)+": failed to fork()");
                         if(pf) {
                             _exit(0);
                         }
                     }
                     pid_file pidfile;
                     pidfile.set(config.pidfile);
                     signal(SIGINT,lethal_signal_handler);
                     signal(SIGABRT,lethal_signal_handler);
                     signal(SIGTERM,lethal_signal_handler);
                     signal(SIGHUP,sighup_handler);
                     sigset_t sset;
                     sigemptyset(&sset);
                     sigaddset(&sset,SIGINT); sigaddset(&sset,SIGABRT);
                     sigaddset(&sset,SIGTERM); sigaddset(&sset,SIGHUP);
                     sigprocmask(SIG_UNBLOCK,&sset,NULL);
                     while(!finishing) {
                         check_herd(config);
                         sleep(config.check_interval);
                     }
+                    if(restarting)
+                        execvp(_argv[0],_argv);
                 }
                 break;
             default:
                 throw runtime_error(string(__PRETTY_FUNCTION__)+": internal error");
         }
     }catch(exception& e) {
         cerr << "Oops: " << e.what() << endl;
         return 1;
     }
 }