diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 13:01:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 13:01:02 -0500 |
| commit | 9d5873cdaedf5bbae50bec08bb0719a1a5be403d (patch) | |
| tree | a421e78f14aa53dfce417d48696f57d4b69e0b9c /src/or | |
| parent | 613073e449c22ad3583e406e48cf5ada395489f0 (diff) | |
| parent | ce149c10227bd4d65bfa62898e729430981328c1 (diff) | |
| download | tor-9d5873cdaedf5bbae50bec08bb0719a1a5be403d.tar.gz tor-9d5873cdaedf5bbae50bec08bb0719a1a5be403d.zip | |
Merge branch 'log_domains' into maint-0.2.2
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 7 | ||||
| -rw-r--r-- | src/or/or.h | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index ec86dbca56..178ed1e385 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -288,6 +288,7 @@ static config_var_t _option_vars[] = { OBSOLETE("IgnoreVersion"), V(KeepalivePeriod, INTERVAL, "5 minutes"), VAR("Log", LINELIST, Logs, NULL), + V(LogMessageDomains, BOOL, "0"), OBSOLETE("LinkPadding"), OBSOLETE("LogLevel"), OBSOLETE("LogFile"), @@ -3817,7 +3818,8 @@ options_transition_affects_workers(or_options_t *old_options, old_options->SafeLogging != new_options->SafeLogging || old_options->ClientOnly != new_options->ClientOnly || public_server_mode(old_options) != public_server_mode(new_options) || - !config_lines_eq(old_options->Logs, new_options->Logs)) + !config_lines_eq(old_options->Logs, new_options->Logs) || + old_options->LogMessageDomains != new_options->LogMessageDomains) return 1; /* Check whether log options match. */ @@ -4393,6 +4395,9 @@ options_init_logs(or_options_t *options, int validate_only) } smartlist_free(elts); + if (ok && !validate_only) + logs_set_domain_logging(options->LogMessageDomains); + return ok?0:-1; } diff --git a/src/or/or.h b/src/or/or.h index 752de219ef..2a55668404 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2345,6 +2345,9 @@ typedef struct { config_line_t *Logs; /**< New-style list of configuration lines * for logs */ + int LogMessageDomains; /**< Boolean: Should we log the domain(s) in which + * each log message occurs? */ + char *DebugLogFile; /**< Where to send verbose log messages. */ char *DataDirectory; /**< OR only: where to store long-term data. */ char *Nickname; /**< OR only: nickname of this onion router. */ |