Exit immediately if we can't monitor our owning controller process

tor_process_monitor_new can't currently return NULL, but if it ever can,
we want that to be an explicitly fatal error, without relying on the fact
that monitor_owning_controller_process's chain of caller will exit if it
fails.
This commit is contained in:
Robert Ransom
2011-05-16 10:25:59 -07:00
parent 0caa37db4d
commit b3133d1cad
3 changed files with 12 additions and 15 deletions
+1 -4
View File
@@ -1232,10 +1232,7 @@ options_act(or_options_t *old_options)
return -1;
}
if (monitor_owning_controller_process(options->OwningControllerProcess)) {
log_warn(LD_CONFIG, "Error monitoring owning controller process");
return -1;
}
monitor_owning_controller_process(options->OwningControllerProcess);
/* reload keys as needed for rendezvous services. */
if (rend_service_load_keys()<0) {