-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 | |||
@@ -141,83 +141,88 @@ void process::do_notify(const string& id,const string& event,const string& descr | |||
141 | string nschema = the_notify.substr(0,colon); | 141 | string nschema = the_notify.substr(0,colon); |
142 | string ntarget = the_notify.substr(colon+1); | 142 | string ntarget = the_notify.substr(colon+1); |
143 | if(nschema=="mailto") { | 143 | if(nschema=="mailto") { |
144 | notify_mailto(ntarget,id,event,description,config); | 144 | notify_mailto(ntarget,id,event,description,config); |
145 | }else | 145 | }else |
146 | throw runtime_error("unrecognized notification schema"); | 146 | throw runtime_error("unrecognized notification schema"); |
147 | }catch(exception& e) { | 147 | }catch(exception& e) { |
148 | syslog(LOG_ERR,"Notification error: %s",e.what()); | 148 | syslog(LOG_ERR,"Notification error: %s",e.what()); |
149 | } | 149 | } |
150 | } | 150 | } |
151 | 151 | ||
152 | void process::notify_mailto(const string& email,const string& id,const string& event,const string& description,configuration& config) { | 152 | void process::notify_mailto(const string& email,const string& id,const string& event,const string& description,configuration& config) { |
153 | int files[2]; | 153 | int files[2]; |
154 | if(pipe(files)) | 154 | if(pipe(files)) |
155 | throw runtime_error("Failed to pipe()"); | 155 | throw runtime_error("Failed to pipe()"); |
156 | pid_t pid = vfork(); | 156 | pid_t pid = vfork(); |
157 | if(pid==-1) { | 157 | if(pid==-1) { |
158 | close(files[0]); | 158 | close(files[0]); |
159 | close(files[1]); | 159 | close(files[1]); |
160 | throw runtime_error("Failed to vfork()"); | 160 | throw runtime_error("Failed to vfork()"); |
161 | } | 161 | } |
162 | if(!pid) { | 162 | if(!pid) { |
163 | // child | 163 | // child |
164 | if(dup2(files[0],0)!=0) | 164 | if(dup2(files[0],0)!=0) |
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; |
181 | fprintf(mta,"%s: %s\n",i->first.c_str(),i->second.c_str()); | 187 | fprintf(mta,"%s: %s\n",i->first.c_str(),i->second.c_str()); |
182 | } | 188 | } |
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) |
200 | throw runtime_error("no pidfile found"); | 205 | throw runtime_error("no pidfile found"); |
201 | pid_t pid = 0; | 206 | pid_t pid = 0; |
202 | pids >> pid; | 207 | pids >> pid; |
203 | pids.close(); | 208 | pids.close(); |
204 | if(!pid) | 209 | if(!pid) |
205 | throw runtime_error("no pid in pidfile"); | 210 | throw runtime_error("no pid in pidfile"); |
206 | if(kill(pid,signum)) | 211 | if(kill(pid,signum)) |
207 | throw runtime_error("failed to signal process"); | 212 | throw runtime_error("failed to signal process"); |
208 | }else if(!process_name.empty()) { | 213 | }else if(!process_name.empty()) { |
209 | if(procpids.empty()) | 214 | if(procpids.empty()) |
210 | gather_proc_info(); | 215 | gather_proc_info(); |
211 | pair<multimap<string,pid_t>::const_iterator,multimap<string,pid_t>::const_iterator> range = procpids.equal_range(process_name); | 216 | pair<multimap<string,pid_t>::const_iterator,multimap<string,pid_t>::const_iterator> range = procpids.equal_range(process_name); |
212 | int count = 0; | 217 | int count = 0; |
213 | for(multimap<string,pid_t>::const_iterator i=range.first;i!=range.second;++i) { | 218 | for(multimap<string,pid_t>::const_iterator i=range.first;i!=range.second;++i) { |
214 | pid_t pid = i->second; | 219 | pid_t pid = i->second; |
215 | if(kill(i->second,signum)) | 220 | if(kill(i->second,signum)) |
216 | throw runtime_error("failed to signal process"); | 221 | throw runtime_error("failed to signal process"); |
217 | count++; | 222 | count++; |
218 | } | 223 | } |
219 | if(!count) | 224 | if(!count) |
220 | throw runtime_error("no running instance detected"); | 225 | throw runtime_error("no running instance detected"); |
221 | }else | 226 | }else |
222 | throw runtime_error("nothing is known about the process"); | 227 | throw runtime_error("nothing is known about the process"); |
223 | } | 228 | } |