Browse Source

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

svn:r5964
Nick Mathewson 19 years ago
parent
commit
f1b91924b2
2 changed files with 5 additions and 4 deletions
  1. 1 1
      doc/TODO
  2. 4 3
      src/or/config.c

+ 1 - 1
doc/TODO

@@ -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 log entries include function names in win32 again.
   - Make "setconf" and "hup" behavior cleaner for LINELIST config
   - Make "setconf" and "hup" behavior cleaner for LINELIST config
     options (e.g. Log). Bug 238.
     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
   - Were we going to load unrecognized 'state' variables into some
     list somewhere, and write them out whenever we update the state?
     list somewhere, and write them out whenever we update the state?
     To be forwards and backwards compatible.
     To be forwards and backwards compatible.

+ 4 - 3
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 (smartlist_len(elts) < 2) { /* only loglevels were provided */
       if (!validate_only) {
       if (!validate_only) {
         if (daemon) {
         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;
       goto cleanup;
     }
     }