summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS.xml2
-rw-r--r--man/dudki.8.in11
-rw-r--r--src/dudki.cc20
3 files changed, 29 insertions, 4 deletions
diff --git a/NEWS.xml b/NEWS.xml
index 646bb90..cd12d05 100644
--- a/NEWS.xml
+++ b/NEWS.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="us-ascii"?>
<news>
<version version="0.2" date="July 23rd, 2004">
- <ni>now dudki sends signals to the processes being monitored from the command line</ni>
+ <ni>now dudki sends arbitrary signals to the processes being monitored from the command line</ni>
</version>
<version version="0.1" date="July 21st, 2004">
<ni><kbd>initgroups()</kbd> called before executing <kbd>RestartCommand</kbd></ni>
<ni>more civilized way of restarting on <kbd>SIGHUP</kbd></ni>
<ni>minor changes to build process</ni>
</version>
diff --git a/man/dudki.8.in b/man/dudki.8.in
index 05db733..be60f53 100644
--- a/man/dudki.8.in
+++ b/man/dudki.8.in
@@ -1,13 +1,13 @@
-.TH dudki 8 "June 9th, 2004" "dudki(8)" "Klever Group (http://www.klever.net/)"
+.TH dudki 8 "July 23rd, 2004" "dudki(8)" "Klever Group (http://www.klever.net/)"
.hla en
.ds longopt @HAVE_GETOPT_LONG@
.SH NAME
-dudki \- a process monitoring daemon
+dudki \- a process maintenance daemon
.SH SYNOPSYS
\fBdudki\fR [\fB-h\fR]
.if \*[longopt] [\fB--help\fR] [\fB--usage\fR]
[\fB-V\fR]
@@ -19,12 +19,14 @@ dudki \- a process monitoring daemon
[\fB-k\fR]
.if \*[longopt] [\fB--kill\fR]
[\fB-r\fR]
.if \*[longopt] [\fB--reload\fR]
[\fB-c\fR]
.if \*[longopt] [\fB--check\fR]
+[\fB-s\fR \fIsignum\fR]
+.if \*[longopt] [\fB--signal=\fR\fIsignum\fR]
[\fB-e\fR]
.if \*[longopt] [\fB--ensure\fR]
[\fB-t\fR]
.if \*[longopt] [\fB--test\fR]
[\fI<process-list>\fR]
@@ -52,12 +54,17 @@ name specified on the command line, dudki kills his own running instance.
.ie \*[longopt] \fB-r\fR, \fB--reload\fR
.el \fB-r\fR
Reload the running instance by sending the \fBSIGHUP\fR signal. Like with
\fB-k\fR, if no process name specified on the command line, dudki sends
\fBSIGHUP\fR to his own running instance.
.TP
+.ie \*[longopt] \fB-s\fR \fIsignum\fR, \fB--signal=\fR\fIsignum\fR
+.el \fB-s\fR \fIsignum\fR
+Send arbitrary signal to the names processes (or self, but it doesn't make much
+sense).
+.TP
.ie \*[longopt] \fB-c\fR, \fB--check\fR
.el \fB-c\fR
Check if dudki is running. Exit with non-zero status if not. The same target
rules as in \fB-k\fR and \fB-r\fR apply here.
.TP
.ie \*[longopt] \fB-e\fR, \fB--ensure\fR
diff --git a/src/dudki.cc b/src/dudki.cc
index e91ad5e..9562079 100644
--- a/src/dudki.cc
+++ b/src/dudki.cc
@@ -1,9 +1,10 @@
#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"
@@ -65,22 +66,23 @@ int main(int argc,char **argv) {
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);
@@ -101,12 +103,14 @@ int main(int argc,char **argv) {
" -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 */
@@ -114,12 +118,13 @@ int main(int argc,char **argv) {
" -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 */
@@ -170,12 +175,25 @@ int main(int argc,char **argv) {
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;
}
}