Merge remote-tracking branch 'asn/bug6779'

This commit is contained in:
Nick Mathewson 2012-09-06 10:12:15 -04:00
commit d2d7cab5b8

View File

@ -3897,10 +3897,15 @@ tor_process_handle_destroy(process_handle_t *process_handle,
if (also_terminate_process) {
if (tor_terminate_process(process_handle) < 0) {
log_notice(LD_GENERAL, "Failed to terminate process with PID '%d'",
tor_process_get_pid(process_handle));
log_notice(LD_GENERAL, "Failed to terminate process with "
"PID '%d' ('%s').", tor_process_get_pid(process_handle),
#ifdef _WIN32
format_win32_error(GetLastError()));
#else
strerror(errno));
#endif
} else {
log_info(LD_GENERAL, "Terminated process with PID '%d'",
log_info(LD_GENERAL, "Terminated process with PID '%d'.",
tor_process_get_pid(process_handle));
}
}