diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 13:02:42 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 13:02:42 -0500 |
| commit | 46b07462ae636eae1e241d5596b3a1d80c82d7ef (patch) | |
| tree | 4efdc232b1d2f9e7c2f1b015b8b457c7ccdfc7f0 /src/or | |
| parent | 933ffd536daf5b00e1ddcb517b2e4e73f2bcb286 (diff) | |
| parent | 9d5873cdaedf5bbae50bec08bb0719a1a5be403d (diff) | |
| download | tor-46b07462ae636eae1e241d5596b3a1d80c82d7ef.tar.gz tor-46b07462ae636eae1e241d5596b3a1d80c82d7ef.zip | |
Merge remote branch 'origin/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 8bf4842ffe..97a2b32451 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -293,6 +293,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"), @@ -3888,7 +3889,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. */ @@ -4495,6 +4497,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 90f01e118a..1617d94a35 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2501,6 +2501,9 @@ typedef struct { * for logs */ int LogTimeGranularity; /**< Log resolution in milliseconds. */ + 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. */ |