summaryrefslogtreecommitdiff
path: root/src/or/transports.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2012-10-23 02:51:31 +0300
committerNick Mathewson <nickm@torproject.org>2012-11-06 17:53:09 -0500
commita9f786758dc59ee28fbbd16228e38ff9ba1bc7a9 (patch)
tree73ecdda4e8680be73f8feb35eeed171ca1d89b9f /src/or/transports.c
parent39a0a2c3ae8c93ceed42f6d2d1143002c231fc16 (diff)
downloadtor-a9f786758dc59ee28fbbd16228e38ff9ba1bc7a9.tar.gz
tor-a9f786758dc59ee28fbbd16228e38ff9ba1bc7a9.zip
Add warning message when a managed proxy dies during configuration.
Diffstat (limited to 'src/or/transports.c')
-rw-r--r--src/or/transports.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/or/transports.c b/src/or/transports.c
index a532f87502..0319071097 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -614,8 +614,15 @@ configure_proxy(managed_proxy_t *mp)
tor_get_lines_from_handle(tor_process_get_stdout_pipe(mp->process_handle),
&stream_status);
if (!proxy_output) { /* failed to get input from proxy */
- if (stream_status != IO_STREAM_EAGAIN)
+ if (stream_status != IO_STREAM_EAGAIN) { /* bad stream status! */
mp->conf_state = PT_PROTO_BROKEN;
+ log_warn(LD_GENERAL, "The communication stream of managed proxy '%s' "
+ "is '%s'. Most probably the managed proxy stopped running. "
+ "This might be a bug of the managed proxy, a bug of Tor, or "
+ "a misconfiguration. Please enable logging on your managed "
+ "proxy and check the logs for errors.",
+ mp->argv[0], stream_status_to_string(stream_status));
+ }
goto done;
}