summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-06-15 15:25:46 -0400
committerNick Mathewson <nickm@torproject.org>2012-06-15 15:25:46 -0400
commit87409771c45abdd8bcf82c84a6ab7fccc5c17ba7 (patch)
tree2c4735896f01c4c7409e6795ea3559339ee12c8a
parent879b1e10101f4eb5ecfb37c7a51f2882c2ac3ea1 (diff)
downloadtor-87409771c45abdd8bcf82c84a6ab7fccc5c17ba7.tar.gz
tor-87409771c45abdd8bcf82c84a6ab7fccc5c17ba7.zip
Clarify some messages about publishing hidden service descriptors
Fix for bug 3311.
-rw-r--r--changes/bug33115
-rw-r--r--src/or/rendservice.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/changes/bug3311 b/changes/bug3311
new file mode 100644
index 0000000000..014d18ddc9
--- /dev/null
+++ b/changes/bug3311
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+ - Replace "Sending publish request" log messages with "Launching
+ upload", so that they no longer confusingly imply that we're
+ sending somtheing to a directory we might not even be connected
+ to yet. Fixes bug 3311; bugfix on 0.2.0.10-alpha.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 5ffc58625e..e88d2b360f 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1918,7 +1918,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
continue;
node = node_get_by_id(hs_dir->identity_digest);
if (!node || !node_has_descriptor(node)) {
- log_info(LD_REND, "Not sending publish request for v2 descriptor to "
+ log_info(LD_REND, "Not launching upload for for v2 descriptor to "
"hidden service directory %s; we don't have its "
"router descriptor. Queuing for later upload.",
safe_str_client(routerstatus_describe(hs_dir)));
@@ -1934,7 +1934,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
base32_encode(desc_id_base32, sizeof(desc_id_base32),
desc->desc_id, DIGEST_LEN);
hs_dir_ip = tor_dup_ip(hs_dir->addr);
- log_info(LD_REND, "Sending publish request for v2 descriptor for "
+ log_info(LD_REND, "Launching upload for v2 descriptor for "
"service '%s' with descriptor ID '%s' with validity "
"of %d seconds to hidden service directory '%s' on "
"%s:%d.",
@@ -2032,7 +2032,7 @@ upload_service_descriptor(rend_service_t *service)
}
/* Post the current descriptors to the hidden service directories. */
rend_get_service_id(service->desc->pk, serviceid);
- log_info(LD_REND, "Sending publish request for hidden service %s",
+ log_info(LD_REND, "Launching upload for hidden service %s",
serviceid);
directory_post_to_hs_dir(service->desc, descs, serviceid,
seconds_valid);