Fix bug noted by roger: rebuild extrainfo store from time to time, even if we...

    - When tunneling an encrypted directory connection, and its first circuit

      fails do not leave it unattached and ask the controller to deal.  Fixes

      the second part of bug 681.

    - Make bridge authorities correctly clean extrainfo store from time to

      time.  Bugfix on 0.2.0.x.

  o Minor features:

    - Allow separate log levels to be configured for different logging

  return (int)(r1->published_on - r2->published_on);

}

/** If the journal is too long, or if <b>force</b> is true, then atomically

 * replace the router store with the routers currently in our routerlist, and

 * clear the journal.  Return 0 on success, -1 on failure.

#define RRS_FORCE 1

#define RRS_DONT_REMOVE_OLD 2

/** If the journal is too long, or if RRS_FORCE is set in <b>flags</b>, then

 * atomically replace the router store with the routers currently in our

 * routerlist, and clear the journal.  Return 0 on success, -1 on failure.

 *

 * If <b>extrainfo</b> is true, rebuild the extrainfo store; else rebuild the

 * router descriptor store.

 */

static int

router_rebuild_store(int force, desc_store_t *store)

router_rebuild_store(int flags, desc_store_t *store)

{

  smartlist_t *chunk_list = NULL;

  char *fname = NULL, *fname_tmp = NULL;

  int nocache=0;

  size_t total_expected_len = 0;

  int had_any;

  int force = flags & RRS_FORCE;

  if (!force && !router_should_rebuild_store(store))

    return 0;

               smartlist_len(routerlist->old_routers))>0;

  /* Don't save deadweight. */

  if (!(flags & RRS_DONT_REMOVE_OLD))

    routerlist_remove_old_routers();

  log_info(LD_DIR, "Rebuilding %s cache", store->description);

  if (store->journal_len || read_from_old_location) {

    /* Always clear the journal on startup.*/

    router_rebuild_store(1, store);

    router_rebuild_store(RRS_FORCE, store);

  } else if (!extrainfo) {

    /* Don't cache expired routers. (This is in an else because

     * router_rebuild_store() also calls remove_old_routers().) */

 done:

  digestset_free(retain);

  router_rebuild_store(RRS_DONT_REMOVE_OLD, &routerlist->desc_store);

  router_rebuild_store(RRS_DONT_REMOVE_OLD,&routerlist->extrainfo_store);

}

/** We just added a new set of descriptors. Take whatever extra steps