summaryrefslogtreecommitdiffabout
path: root/src
authorMichael Krelin <hacker@klever.net>2004-07-23 21:31:57 (UTC)
committer Michael Krelin <hacker@klever.net>2004-07-23 21:31:57 (UTC)
commit125671c860a82643d36bc3da279d0b831fae4b34 (patch) (side-by-side diff)
treeab5edcac7c58e769c9d8436ae0e803edb2ebca9f /src
parent0a7f5999eb47ce113b3cd47b03198947441945a7 (diff)
downloaddudki-125671c860a82643d36bc3da279d0b831fae4b34.zip
dudki-125671c860a82643d36bc3da279d0b831fae4b34.tar.gz
dudki-125671c860a82643d36bc3da279d0b831fae4b34.tar.bz2
ability to send arbitrary signals
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/dudki.cc20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/dudki.cc b/src/dudki.cc
index e91ad5e..9562079 100644
--- a/src/dudki.cc
+++ b/src/dudki.cc
@@ -1,15 +1,16 @@
#include <unistd.h>
#include <signal.h>
#include <syslog.h>
+#include <errno.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
@@ -59,34 +60,35 @@ int main(int argc,char **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_signal,
op_ensure,
op_test
} op = op_default;
int op_signum = 0;
while(true) {
-#define SHORTOPTSTRING "f:hVLrkcet"
+#define SHORTOPTSTRING "f:hVLrkcets:"
#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' },
+ { "signal", required_argument, 0, 's' },
{ "check", no_argument, 0, 'c' },
{ "ensure", no_argument, 0, 'e' },
{ "test", no_argument, 0, 't' },
{ NULL, 0, 0, 0 }
};
int c = getopt_long(argc,argv,SHORTOPTSTRING,opts,NULL);
#else /* !HAVE_GETOPT_LONG */
int c = getopt(argc,argv,SHORTOPTSTRING);
#endif /* /HAVE_GETOPT_LONG */
if(c==-1)
break;
switch(c) {
@@ -95,37 +97,40 @@ int main(int argc,char **argv) {
<< PCOPY << endl << endl
<< " " << argv[0] << " [options] [processes]" << endl << endl <<
#ifdef HAVE_GETOPT_LONG
" -h, --help\n"
" --usage display this text\n"
" -V, --version display version number\n"
" -L, --license show license\n"
" -f filename, --config=filename\n"
" specify the configuration file to use\n"
"\n"
" -k, --kill stop running instance (send SIGTERM)\n"
" -r, --reload reload running instance (send SIGHUP)\n"
+ " -s signum, --signal=signum\n"
+ " send the specified signal to the running process\n"
" -c, --check check if the process is running\n"
" (the above commands operate on dudki itself if no\n"
" process name has been specified)\n"
" -e, --ensure ensure that dudki is running\n"
" -t, --test test configuration file and exit"
#else /* !HAVE_GETOPT_LONG */
" -h display this text\n"
" -V display version number\n"
" -L show license\n"
" -f filename specify the configuration file to use\n"
"\n"
" -k stop running instance (send SIGTERM)\n"
" -r reload running instance (send SIGHUP)\n"
+ " -s signum send the specified signal to the running process\n"
" -c check if the process is running\n"
" (the above commands operate on dudki itself if no\n"
" process name has been specified)\n"
" -e ensure that dudki is running\n"
" -t test configuration file and exit"
#endif /* /HAVE_GETOPT_LONG */
<< endl;
exit(0);
break;
case 'V':
cerr << VERSION << endl;
exit(0);
@@ -164,24 +169,37 @@ int main(int argc,char **argv) {
cerr << "Can't obey two or more orders at once" << endl;
exit(1);
}
op = op_ensure;
break;
case 't':
if(op!=op_default) {
cerr << "Can't obey two or more orders at once" << endl;
exit(1);
}
op = op_test;
break;
+ case 's':
+ if(op!=op_default) {
+ cerr << "Can't obey two or more orders at once" << endl;
+ exit(1);
+ }
+ op = op_signal;
+ errno = 0;
+ op_signum = strtol(optarg,NULL,0);
+ if(errno) {
+ cerr << "Can't obtain the signal value" << endl;
+ exit(1);
+ }
+ break;
default:
cerr << "Huh??" << endl;
exit(1);
break;
}
}
const char *sid = *argv;
const char *t;
while(t = index(sid,'/')) {
sid = t; sid++;
}
openlog(sid,LOG_CONS|LOG_PERROR|LOG_PID,LOG_DAEMON);