aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-06 10:12:15 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-06 10:12:15 -0400
commitd2d7cab5b83e49aba4ae8ecf0aabb9dfcda8d31e (patch)
treef8e0009c355a6e3c36deabc2abec8ec08d8d283b /src
parentdeee0b67c3171cf4a6c7cf9c64c642d882b39880 (diff)
parent93c38b679f01bba7d85ddf5eeac51c462e782a62 (diff)
downloadtor-d2d7cab5b83e49aba4ae8ecf0aabb9dfcda8d31e.tar.gz
tor-d2d7cab5b83e49aba4ae8ecf0aabb9dfcda8d31e.zip
Merge remote-tracking branch 'asn/bug6779'
Diffstat (limited to 'src')
-rw-r--r--src/common/util.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/common/util.c b/src/common/util.c
index ce67252852..4b1bce88ea 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -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));
}
}