author | Michael Krelin <hacker@klever.net> | 2008-08-31 11:50:48 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2008-08-31 11:50:48 (UTC) |
commit | 6a68fcae465905e904eea248ffe6b1ed6b8297a4 (patch) (unidiff) | |
tree | 5f070058ca6cf9948ae9af229694d3d746d2f1c5 /src | |
parent | 26757537328da204e4bf952a80579307440f62c9 (diff) | |
download | dudki-6a68fcae465905e904eea248ffe6b1ed6b8297a4.zip dudki-6a68fcae465905e904eea248ffe6b1ed6b8297a4.tar.gz dudki-6a68fcae465905e904eea248ffe6b1ed6b8297a4.tar.bz2 |
don't break in the absence of sendmail
If for whatever reason notify child isn't properly spawned, don't die and still
try to launch process in question
Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r-- | src/process.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/process.cc b/src/process.cc index 6d3b2a2..4807b98 100644 --- a/src/process.cc +++ b/src/process.cc | |||
@@ -165,16 +165,22 @@ void process::notify_mailto(const string& email,const string& id,const string& e | |||
165 | _exit(-1); | 165 | _exit(-1); |
166 | close(1); | 166 | close(1); |
167 | close(files[0]); | 167 | close(files[0]); |
168 | close(files[1]); | 168 | close(files[1]); |
169 | execl("/usr/sbin/sendmail","usr/sbin/sendmail","-i",email.c_str(),NULL); | 169 | execl("/usr/sbin/sendmail","usr/sbin/sendmail","-i",email.c_str(),NULL); |
170 | _exit(-1); | 170 | _exit(-1); |
171 | } | 171 | } |
172 | // parent | 172 | // parent |
173 | int status; | ||
174 | if(waitpid(pid,&status,WNOHANG)) { | ||
175 | close(files[0]); | ||
176 | close(files[1]); | ||
177 | throw runtime_error("vfork()ed sendmail child exited unexpectedly"); | ||
178 | } | ||
173 | close(files[0]); | 179 | close(files[0]); |
174 | FILE *mta = fdopen(files[1],"w"); | 180 | FILE *mta = fdopen(files[1],"w"); |
175 | for(headers_t::const_iterator i=mailto_headers.begin();i!=mailto_headers.end();++i) { | 181 | for(headers_t::const_iterator i=mailto_headers.begin();i!=mailto_headers.end();++i) { |
176 | fprintf(mta,"%s: %s\n",i->first.c_str(),i->second.c_str()); | 182 | fprintf(mta,"%s: %s\n",i->first.c_str(),i->second.c_str()); |
177 | } | 183 | } |
178 | for(headers_t::const_iterator i=config.mailto_headers.begin();i!=config.mailto_headers.end();++i) { | 184 | for(headers_t::const_iterator i=config.mailto_headers.begin();i!=config.mailto_headers.end();++i) { |
179 | if(mailto_headers.find(i->first)!=mailto_headers.end()) | 185 | if(mailto_headers.find(i->first)!=mailto_headers.end()) |
180 | continue; | 186 | continue; |
@@ -183,17 +189,16 @@ void process::notify_mailto(const string& email,const string& id,const string& e | |||
183 | fprintf(mta, | 189 | fprintf(mta, |
184 | "Subject: [%s] %s\n\n" | 190 | "Subject: [%s] %s\n\n" |
185 | "%s\n" | 191 | "%s\n" |
186 | "---\n" | 192 | "---\n" |
187 | "This message was sent automatically by the 'dudki' daemon\n", | 193 | "This message was sent automatically by the 'dudki' daemon\n", |
188 | id.c_str(), event.c_str(), | 194 | id.c_str(), event.c_str(), |
189 | description.c_str() ); | 195 | description.c_str() ); |
190 | fclose(mta); | 196 | fclose(mta); |
191 | int status; | ||
192 | waitpid(pid,&status,0); | 197 | waitpid(pid,&status,0); |
193 | // TODO: check the return code | 198 | // TODO: check the return code |
194 | } | 199 | } |
195 | 200 | ||
196 | void process::signal(int signum) const { | 201 | void process::signal(int signum) const { |
197 | if(!pidfile.empty()) { | 202 | if(!pidfile.empty()) { |
198 | ifstream pids(pidfile.c_str(),ios::in); | 203 | ifstream pids(pidfile.c_str(),ios::in); |
199 | if(!pids) | 204 | if(!pids) |