[or-cvs] Keep running if we ask for an impossible stdout log; just w...

Nick Mathewson nickm at seul.org
Sat Feb 11 21:56:05 UTC 2006


Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv18000/src/or

Modified Files:
	config.c 
Log Message:
Keep running if we ask for an impossible stdout log; just warn.

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -d -r1.499 -r1.500
--- config.c	11 Feb 2006 21:26:40 -0000	1.499
+++ config.c	11 Feb 2006 21:56:03 -0000	1.500
@@ -2769,10 +2769,11 @@ options_init_logs(or_options_t *options,
     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;
     }



More information about the tor-commits mailing list