clean up a few more log entries

svn:r4304

src/or/directory.c

@@ -664,7 +664,7 @@ connection_dir_client_reached_eof(connection_t *conn)
   if (!reason) reason = tor_strdup("[no reason given]");
 
   log_fn(LOG_DEBUG,
-         "Received response from directory servers '%s': %d \"%s\"",
+         "Received response from directory server '%s': %d \"%s\"",
          conn->address, status_code, reason);
 
   if (date_header > 0) {

src/or/main.c

@@ -818,11 +818,11 @@ static void second_elapsed_callback(int fd, short event, void *args)
     /* every 20 minutes, check and complain if necessary */
     routerinfo_t *me = router_get_my_routerinfo();
     if (!check_whether_orport_reachable())
-      log_fn(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its ORPort is reachable. Please check your firewalls, ports, address, etc.",
-             me ? me->address : options->Address, options->ORPort);
+      log(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its ORPort is reachable. Please check your firewalls, ports, address, etc.",
+          me ? me->address : options->Address, options->ORPort);
     if (!check_whether_dirport_reachable())
-      log_fn(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its DirPort is reachable. Please check your firewalls, ports, address, etc.",
-             me ? me->address : options->Address, options->DirPort);
+      log(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its DirPort is reachable. Please check your firewalls, ports, address, etc.",
+          me ? me->address : options->Address, options->DirPort);
   }
 
   /* if more than 100s have elapsed, probably the clock jumped: doesn't count. */

src/or/router.c

@@ -405,7 +405,7 @@ void consider_testing_reachability(void) {
     if (me) {
       directory_initiate_command_router(me, DIR_PURPOSE_FETCH_DIR, 1, NULL, NULL, 0);
     } else {
-      log_fn(LOG_NOTICE,"Delaying checking DirPort reachability; can't build descriptor.");
+      log(LOG_NOTICE,"Delaying checking DirPort reachability; can't build descriptor.");
     }
   }
 }
@@ -414,7 +414,7 @@ void consider_testing_reachability(void) {
 void router_orport_found_reachable(void) {
   if (!can_reach_or_port) {
     if (!clique_mode(get_options()))
-      log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
+      log(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
     can_reach_or_port = 1;
     consider_publishable_server(time(NULL), 1);
   }
@@ -423,7 +423,7 @@ void router_orport_found_reachable(void) {
 /** Annotate that we found our DirPort reachable. */
 void router_dirport_found_reachable(void) {
   if (!can_reach_dir_port) {
-    log_fn(LOG_NOTICE,"Your DirPort is reachable from the outside. Excellent.");
+    log(LOG_NOTICE,"Your DirPort is reachable from the outside. Excellent.");
     can_reach_dir_port = 1;
   }
 }