diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2011-05-16 10:25:59 -0700 |
|---|---|---|
| committer | Robert Ransom <rransom.8774@gmail.com> | 2011-05-20 08:25:42 -0700 |
| commit | b3133d1cadec0540105a855b1fd2eb741d4eec9d (patch) | |
| tree | d00e7a402ff3c5c323e4e89654fa8904cb0891d8 /src/or/config.c | |
| parent | 0caa37db4df76fc50af48a107a14e4f139b7fa55 (diff) | |
| download | tor-b3133d1cadec0540105a855b1fd2eb741d4eec9d.tar.gz tor-b3133d1cadec0540105a855b1fd2eb741d4eec9d.zip | |
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.
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index b2bc9f3e9a..0d1c37f6b6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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) { |