more useful logging for rend services and clients

svn:r1641

2 files changed, 14 insertions, 9 deletions

diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 1a1a33b00..aaa9e4bed 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -208,13 +208,13 @@ rend_client_introduction_acked(circuit_t *circ,
         nickname = rend_client_get_random_intro(circ->rend_query);
         assert(nickname);
         if (!router_get_by_nickname(nickname)) {
-          log_fn(LOG_WARN, "Advertised intro point '%s' is not known. Closing.",
-                 nickname);
+          log_fn(LOG_WARN, "Advertised intro point '%s' for %s is not known. Closing.",
+                 nickname, circ->rend_query);
           circuit_mark_for_close(circ);
           return -1;
         }
-        log_fn(LOG_INFO, "Chose new intro point %s for %s (circ %d)",
-               nickname, circ->rend_query, circ->n_circ_id);
+        log_fn(LOG_INFO, "Chose new intro point %s for %s (circ %d, %d choices left)",
+               nickname, circ->rend_query, circ->n_circ_id, ent->parsed->n_intro_points);
         circ->state = CIRCUIT_STATE_BUILDING;
         tor_free(circ->build_state->chosen_exit);
         circ->build_state->chosen_exit = tor_strdup(nickname);
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index f4639f7d7..ae793f175 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -769,8 +769,11 @@ void rend_services_introduce(void) {
 
     /* Find out which introduction points we have in progress for this service. */
     for (j=0;j< smartlist_len(service->intro_nodes); ++j) {
-      router = router_get_by_nickname(smartlist_get(service->intro_nodes,j));
+      intro = smartlist_get(service->intro_nodes, j);
+      router = router_get_by_nickname(intro);
       if (!router || !find_intro_circuit(router,service->pk_digest)) {
+        log_fn(LOG_INFO,"Giving up on %s as intro point for %s.",
+                intro, service->service_id);
         smartlist_del(service->intro_nodes,j--);
         changed = service->desc_is_dirty = 1;
       }
@@ -794,15 +797,16 @@ void rend_services_introduce(void) {
                                          service->intro_exclude_nodes,
                                          exclude_routers);
       if (!router) {
-        log_fn(LOG_WARN, "Could only establish %d introduction points",
-               smartlist_len(service->intro_nodes));
+        log_fn(LOG_WARN, "Could only establish %d introduction points for %s",
+               smartlist_len(service->intro_nodes), service->service_id);
         break;
       }
       changed = 1;
       smartlist_add(intro_routers, router);
       smartlist_add(exclude_routers, router);
       smartlist_add(service->intro_nodes, tor_strdup(router->nickname));
-      log_fn(LOG_INFO,"Picked router %s as an intro point.", router->nickname);
+      log_fn(LOG_INFO,"Picked router %s as an intro point for %s.", router->nickname,
+             service->service_id);
     }
 
     /* Reset exclude_routers to include obsolete routers only for the next
@@ -818,7 +822,8 @@ void rend_services_introduce(void) {
       intro = smartlist_get(service->intro_nodes, j);
       r = rend_service_launch_establish_intro(service, intro);
       if (r<0) {
-        log_fn(LOG_WARN, "Error launching circuit to node %s", intro);
+        log_fn(LOG_WARN, "Error launching circuit to node %s for service %s",
+               intro, service->service_id);
       }
     }
   }