Commit 171a00ec authored by Roger Dingledine's avatar Roger Dingledine
Browse files

fix a log level -- err is for things that kill tor, warn is for 

things that tor can recover from.

also, avoid situations where people who don't read their logs
accumulate ten thousand useless files in their datadir.


svn:r8227
parent fd36eb07

src/or/config.c

+3 −3
Changes for src/or/config.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -3822,7 +3822,7 @@ or_state_load(void) 
  }



  if (badstate && !contents) {

    log_err(LD_BUG, "Uh oh.  We couldn't even validate our own default state. "

    log_warn(LD_BUG, "Uh oh.  We couldn't even validate our own default state."

             " This is a bug in Tor.");

    goto done;

  } else if (badstate && contents) {
@@ -3830,13 +3830,13 @@ or_state_load(void) 
    file_status_t status;

    size_t len = strlen(fname)+16;

    char *fname2 = tor_malloc(len);

    for (i = 0; i < 10000; ++i) {

    for (i = 0; i < 100; ++i) {

      tor_snprintf(fname2, len, "%s.%d", fname, i);

      status = file_status(fname2);

      if (status == FN_NOENT)

        break;

    }

    if (i == 10000) {

    if (i == 100) {

      log_warn(LD_BUG, "Unable to parse state in \"%s\"; too many saved bad "

               "state files to move aside. Discarding the old state file.",

               fname);