summaryrefslogtreecommitdiffabout
path: root/src
Side-by-side diff
Diffstat (limited to 'src') (more/less context) (ignore whitespace changes)
-rw-r--r--src/configuration.cc5
-rw-r--r--src/dudki.cc7
-rw-r--r--src/process.cc118
-rw-r--r--src/process.h6
4 files changed, 124 insertions, 12 deletions
diff --git a/src/configuration.cc b/src/configuration.cc
index eb010c1..edc8c04 100644
--- a/src/configuration.cc
+++ b/src/configuration.cc
@@ -94,2 +94,6 @@ static DOTCONF_CB(dco__process) { dc_context *dcc = (dc_context*)ctx;
+static DOTCONF_CB(dco_process_name) { dc_context *dcc = (dc_context*)ctx;
+ dcc->ps->process_name = cmd->data.str;
+ return NULL;
+}
static DOTCONF_CB(dco_restart_command) { dc_context *dcc = (dc_context*)ctx;
@@ -118,2 +122,3 @@ static const configoption_t dc_options[] = {
{ "<Process", ARG_STR, dco_process, NULL, DCC_ROOT },
+ { "ProcessName", ARG_STR, dco_process_name, NULL, DCC_PROCESS },
{ "RestartCommand", ARG_STR, dco_restart_command, NULL, DCC_PROCESS },
diff --git a/src/dudki.cc b/src/dudki.cc
index 9562079..c966695 100644
--- a/src/dudki.cc
+++ b/src/dudki.cc
@@ -37,4 +37,6 @@ static void sighup_handler(int signum) {
void check_herd(configuration& config) {
+ process::prepare_herd();
for(processes_t::iterator i=config.processes.begin();i!=config.processes.end();++i)
i->second.check(i->first,config);
+ process::unprepare_herd();
}
@@ -222,3 +224,6 @@ int main(int argc,char **argv) {
throw runtime_error("no such process configured");
- i->second.signal(op_signum);
+ if(op_signum)
+ i->second.signal(op_signum);
+ else
+ i->second.check();
}catch(exception& e) {
diff --git a/src/process.cc b/src/process.cc
index 1ffac9f..8a5b5d2 100644
--- a/src/process.cc
+++ b/src/process.cc
@@ -6,2 +6,3 @@
#include <grp.h>
+#include <dirent.h>
#include <sys/wait.h>
@@ -11,3 +12,6 @@
#include <fstream>
+#include <sstream>
#include <stdexcept>
+#include <string>
+#include <vector>
using namespace std;
@@ -16,5 +20,17 @@ using namespace std;
+static multimap<string,pid_t> procpids;
+
+void process::check() const {
+ if(!pidfile.empty()) {
+ signal(0);
+ }else if(!process_name.empty()) {
+ if(procpids.empty())
+ gather_proc_info();
+ if(procpids.find(process_name)==procpids.end())
+ throw runtime_error("no such process");
+ } // XXX: or else?
+}
void process::check(const string& id,configuration& config) {
try {
- signal(0);
+ check();
patience = 0;
@@ -178,12 +194,92 @@ void process::notify_mailto(const string& email,const string& id,const string& e
void process::signal(int signum) const {
- ifstream pids(pidfile.c_str(),ios::in);
- if(!pids)
- throw runtime_error("no pidfile found");
- pid_t pid = 0;
- pids >> pid;
- pids.close();
- if(!pid)
- throw runtime_error("no pid in pidfile");
- if(kill(pid,signum))
- throw runtime_error("failed to signal process");
+ if(!pidfile.empty()) {
+ ifstream pids(pidfile.c_str(),ios::in);
+ if(!pids)
+ throw runtime_error("no pidfile found");
+ pid_t pid = 0;
+ pids >> pid;
+ pids.close();
+ if(!pid)
+ throw runtime_error("no pid in pidfile");
+ if(kill(pid,signum))
+ throw runtime_error("failed to signal process");
+ }else if(!process_name.empty()) {
+ if(procpids.empty())
+ gather_proc_info();
+ pair<multimap<string,pid_t>::const_iterator,multimap<string,pid_t>::const_iterator> range = procpids.equal_range(process_name);
+ int count = 0;
+ for(multimap<string,pid_t>::const_iterator i=range.first;i!=range.second;++i) {
+ pid_t pid = i->second;
+ if(kill(i->second,signum))
+ throw runtime_error("failed to signal process");
+ count++;
+ }
+ if(!count)
+ throw runtime_error("no running instance detected");
+ }else
+ throw runtime_error("nothing is known about the process");
+}
+
+void process::prepare_herd() {
+ procpids.clear();
+}
+void process::unprepare_herd() {
+ procpids.clear();
+}
+void process::gather_proc_info() {
+ vector<pid_t> allpids;
+ DIR *pd = opendir("/proc");
+ if(!pd)
+ throw runtime_error("failed to open /proc");
+ struct dirent *pde;
+ pid_t selfpid = getpid();
+ while(pde=readdir(pd)) {
+ errno=0;
+ pid_t pid = atoi(pde->d_name);
+ if((!pid) || pid==selfpid)
+ continue;
+ allpids.push_back(pid);
+ }
+ closedir(pd);
+ char s[256];
+ procpids.clear();
+ for(vector<pid_t>::const_iterator i=allpids.begin();i!=allpids.end();++i) {
+ int r = snprintf(s,sizeof(s),"/proc/%d/stat",*i);
+ if(r>=sizeof(s) || r<1)
+ continue;
+ string cmd;
+ ifstream ss(s,ios::in);
+ if(!ss)
+ continue;
+ getline(ss,cmd);
+ string::size_type op = cmd.find('(');
+ if(op==string::npos)
+ continue;
+ cmd.erase(0,op+1);
+ string::size_type cp = cmd.find(')');
+ if(cp==string::npos)
+ continue;
+ cmd.erase(cp);
+ r = snprintf(s,sizeof(s),"/proc/%d/cmdline",*i);
+ if(r>=sizeof(s) || r<1)
+ continue;
+ ifstream cs(s,ios::binary);
+ if(!cs)
+ continue;
+ string command;
+ while(cs) {
+ string cl;
+ getline(cs,cl,(char)0);
+ string::size_type lsl = cl.rfind('/');
+ if(lsl!=string::npos)
+ cl.erase(0,lsl+1);
+ if(cl.substr(0,cmd.length())==cmd) {
+ command = cl;
+ break;
+ }
+ }
+ procpids.insert(pair<string,pid_t>(cmd,*i));
+ if((!command.empty()) && cmd!=command)
+ procpids.insert(pair<string,pid_t>(command,*i));
+ }
}
diff --git a/src/process.h b/src/process.h
index 27ee049..90b12d9 100644
--- a/src/process.h
+++ b/src/process.h
@@ -14,2 +14,3 @@ class process {
string pidfile;
+ string process_name;
string restart_cmd;
@@ -33,2 +34,7 @@ class process {
void signal(int signum) const;
+ void check() const;
+
+ static void prepare_herd();
+ static void gather_proc_info();
+ static void unprepare_herd();
};