[or-cvs] r12306: Implement --quiet. (in tor/trunk: . doc src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-11-01 00:38:43 -0400 (Thu, 01 Nov 2007)
New Revision: 12306

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/doc/TODO
   tor/trunk/src/or/config.c
   tor/trunk/src/or/main.c
Log:
 r16322 at catbus:  nickm | 2007-11-01 00:26:15 -0400
 Implement --quiet.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r16322] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-11-01 04:14:23 UTC (rev 12305)
+++ tor/trunk/ChangeLog	2007-11-01 04:38:43 UTC (rev 12306)
@@ -39,6 +39,8 @@
       how skewed they are, and how much this matters.
     - When we have a certificate for an authority, believe that certificate's
       claims about the authority's IP address.
+    - New --quiet command-line option to suppress the default console log.
+      Good in combination with --hash-password.
 
   o Minor features (controller):
     - When reporting clock skew, and we only have a lower bound on the amount

Modified: tor/trunk/doc/TODO
===================================================================
--- tor/trunk/doc/TODO	2007-11-01 04:14:23 UTC (rev 12305)
+++ tor/trunk/doc/TODO	2007-11-01 04:38:43 UTC (rev 12306)
@@ -97,7 +97,7 @@
           unreachable is bunk -- it's leftover from the time when all
           servers ran 24/7. now it triggers every time a server goes
           away and then returns before the old descriptor has expired.
-      - add a --quiet commandline option that suppresses logs. useful
+      o add a --quiet commandline option that suppresses logs. useful
         for --hashed-password and maybe others.
       - Tor logs the libevent version on startup, for debugging purposes.
         This is great. But it does this before configuring the logs, so

Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c	2007-11-01 04:14:23 UTC (rev 12305)
+++ tor/trunk/src/or/config.c	2007-11-01 04:38:43 UTC (rev 12306)
@@ -1195,7 +1195,8 @@
       continue;
     } else if (!strcmp(argv[i],"--list-fingerprint") ||
                !strcmp(argv[i],"--verify-config") ||
-               !strcmp(argv[i],"--ignore-missing-torrc")) {
+               !strcmp(argv[i],"--ignore-missing-torrc") ||
+               !strcmp(argv[i],"--quiet")) {
       i += 1; /* command-line option. ignore it. */
       continue;
     } else if (!strcmp(argv[i],"--nt-service") ||
@@ -1203,6 +1204,7 @@
       i += 1;
       continue;
     }
+
     if (i == argc-1) {
       log_warn(LD_CONFIG,"Command-line option '%s' with no value. Failing.",
                argv[i]);

Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c	2007-11-01 04:14:23 UTC (rev 12305)
+++ tor/trunk/src/or/main.c	2007-11-01 04:38:43 UTC (rev 12306)
@@ -1718,6 +1718,7 @@
 tor_init(int argc, char *argv[])
 {
   char buf[256];
+  int i, quiet = 0;
   time_of_process_start = time(NULL);
   if (!connection_array)
     connection_array = smartlist_create();
@@ -1737,8 +1738,16 @@
   addressmap_init(); /* Init the client dns cache. Do it always, since it's
                       * cheap. */
 
-  /* give it somewhere to log to initially */
-  add_temp_log();
+  /* We search for the "quiet" option first, since it decides whether we
+   * will log anything at all to the command line. */
+  for (i=1;i<argc;++i) {
+    if (!strcmp(argv[i], "--quiet")) /*DOCDOC in mangpage.*/
+      quiet = 1;
+  }
+  if (!quiet) {
+    /* give it somewhere to log to initially */
+    add_temp_log();
+  }
 
   log(LOG_NOTICE, LD_GENERAL, "Tor v%s. This is experimental software. "
       "Do not rely on it for strong anonymity. (Running on %s)",get_version(),