diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 3 | ||||
| -rw-r--r-- | src/or/main.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c index 87ad7d5950..d348f1036b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1161,8 +1161,6 @@ options_act_reversible(const or_options_t *old_options, char **msg) goto rollback; } - sandbox_set_debugging_fd(get_err_logging_fd()); - commit: r = 0; if (logs_marked) { @@ -1172,6 +1170,7 @@ options_act_reversible(const or_options_t *old_options, char **msg) add_callback_log(severity, control_event_logmsg); control_adjust_event_log_severity(); tor_free(severity); + tor_log_update_sigsafe_err_fds(); } if (get_min_log_level() >= LOG_INFO && get_min_log_level() != old_min_log_level) { diff --git a/src/or/main.c b/src/or/main.c index aa5642509b..e14001f102 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -13,6 +13,7 @@ #define MAIN_PRIVATE #include "or.h" #include "addressmap.h" +#include "backtrace.h" #include "buffers.h" #include "channel.h" #include "channeltls.h" @@ -2330,13 +2331,14 @@ handle_signals(int is_parent) int tor_init(int argc, char *argv[]) { - char buf[256]; + char progname[256]; int quiet = 0; + time_of_process_start = time(NULL); init_connection_lists(); /* Have the log set up with our application name. */ - tor_snprintf(buf, sizeof(buf), "Tor %s", get_version()); - log_set_application_name(buf); + tor_snprintf(progname, sizeof(progname), "Tor %s", get_version()); + log_set_application_name(progname); /* Initialize the history structures. */ rep_hist_init(); /* Initialize the service cache. */ @@ -2839,6 +2841,8 @@ tor_main(int argc, char *argv[]) } #endif + configure_backtrace_handler(get_version()); + update_approx_time(time(NULL)); tor_threads_init(); init_logging(); |