nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make --quiet and --hush apply to default logs, not only initial logs

Browse Source 
Fixes bug 3550; bugfix on 0.2.0.10-alpha (where --quiet was introduced).
This commit is contained in:
Nick Mathewson 2011-08-04 14:23:51 -04:00
parent 6596aa022f
commit e5e7b6d718
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug3550 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- The "--quiet" and "--hush" options now apply not only to Tor's
behavior before user-configured logs are added, but also to
Tor's behavior in the absense of configured logs. Fixes bug
3550; bugfix on 0.2.0.10-alpha.

11
src/or/config.c
View File

@ -40,6 +40,9 @@
#include "procmon.h" #include "procmon.h"
/* From main.c */
extern int quiet_level;
/** Enumeration of types which option values can take */ /** Enumeration of types which option values can take */
typedef enum config_type_t { typedef enum config_type_t {
CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */ CONFIG_TYPE_STRING = 0, /**< An arbitrary string. */
@ -3095,8 +3098,12 @@ options_validate(or_options_t *old_options, or_options_t *options,
"misconfigured or something else goes wrong."); "misconfigured or something else goes wrong.");
/* Special case on first boot if no Log options are given. */ /* Special case on first boot if no Log options are given. */
if (!options->Logs && !options->RunAsDaemon && !from_setconf) if (!options->Logs && !options->RunAsDaemon && !from_setconf) {
config_line_append(&options->Logs, "Log", "notice stdout"); if (quiet_level == 0)
config_line_append(&options->Logs, "Log", "notice stdout");
else if (quiet_level == 1)
config_line_append(&options->Logs, "Log", "warn stdout");
}
if (options_init_logs(options, 1)<0) /* Validate the log(s) */ if (options_init_logs(options, 1)<0) /* Validate the log(s) */
REJECT("Failed to validate Log options. See logs for details."); REJECT("Failed to validate Log options. See logs for details.");

7
src/or/main.c
View File

@ -154,6 +154,12 @@ int can_complete_circuit=0;
* they are obsolete? */ * they are obsolete? */
#define TLS_HANDSHAKE_TIMEOUT (60) #define TLS_HANDSHAKE_TIMEOUT (60)
/** Decides our behavior when no logs are configured/before any
* logs have been configured. For 0, we log notice to stdout as normal.
* For 1, we log warnings only. For 2, we log nothing.
*/
int quiet_level = 0;
/********* END VARIABLES ************/ /********* END VARIABLES ************/
/**************************************************************************** /****************************************************************************
@ -2148,6 +2154,7 @@ tor_init(int argc, char *argv[])
default: default:
add_temp_log(LOG_NOTICE); add_temp_log(LOG_NOTICE);
} }
quiet_level = quiet;
log(LOG_NOTICE, LD_GENERAL, "Tor v%s. This is experimental software. " 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(), "Do not rely on it for strong anonymity. (Running on %s)",get_version(),