Commit f1b91924 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Keep running if we ask for an impossible stdout log; just warn. 


svn:r5964
parent 165a9abe

doc/TODO

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ R - Clients use it. (But not till the directories have upgraded!) 
  - make log entries include function names in win32 again.

  - Make "setconf" and "hup" behavior cleaner for LINELIST config

    options (e.g. Log). Bug 238.

  - "options_init_logs(): Can't log to stdout with RunAsDaemon set."

  o "options_init_logs(): Can't log to stdout with RunAsDaemon set."

  - Were we going to load unrecognized 'state' variables into some

    list somewhere, and write them out whenever we update the state?

    To be forwards and backwards compatible.

src/or/config.c

+4 −3
Original line number Diff line number Diff line
@@ -2769,11 +2769,12 @@ options_init_logs(or_options_t *options, int validate_only) 
    if (smartlist_len(elts) < 2) { /* only loglevels were provided */

      if (!validate_only) {

        if (daemon) {

          warn(LD_CONFIG, "Can't log to stdout with RunAsDaemon set.");

          ok = 0; goto cleanup;

        }

          warn(LD_CONFIG,

               "Can't log to stdout with RunAsDaemon set; skipping stdout");

        } else {

          add_stream_log(levelMin, levelMax, "<stdout>", stdout);

        }

      }

      goto cleanup;

    }

    if (!strcasecmp(smartlist_get(elts,1), "file")) {