diff options
| -rw-r--r-- | doc/TODO | 2 | ||||
| -rw-r--r-- | src/or/config.c | 7 |
2 files changed, 5 insertions, 4 deletions
@@ -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. diff --git a/src/or/config.c b/src/or/config.c index f177012d8..d97d8c4b7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2769,10 +2769,11 @@ 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); } - add_stream_log(levelMin, levelMax, "<stdout>", stdout); } goto cleanup; } |