Merge branch 'maint-0.3.3' into release-0.3.3
This commit is contained in:
commit
6d44cf66c7
|
@ -0,0 +1,4 @@
|
|||
o Documentation:
|
||||
- Update the documentation for "Log" to include the current list
|
||||
of logging domains. Closes ticket 25378.
|
||||
|
|
@ -650,7 +650,8 @@ GENERAL OPTIONS
|
|||
+
|
||||
The currently recognized domains are: general, crypto, net, config, fs,
|
||||
protocol, mm, http, app, control, circ, rend, bug, dir, dirserv, or, edge,
|
||||
acct, hist, and handshake. Domain names are case-insensitive. +
|
||||
acct, hist, handshake, heartbeat, channel, sched, guard, consdiff, and dos.
|
||||
Domain names are case-insensitive. +
|
||||
+
|
||||
For example, "`Log [handshake]debug [~net,~mm]info notice stdout`" sends
|
||||
to stdout: all handshake messages of any severity, all info-and-higher
|
||||
|
|
|
@ -1258,7 +1258,10 @@ log_level_to_string(int level)
|
|||
}
|
||||
|
||||
/** NULL-terminated array of names for log domains such that domain_list[dom]
|
||||
* is a description of <b>dom</b>. */
|
||||
* is a description of <b>dom</b>.
|
||||
*
|
||||
* Remember to update doc/tor.1.txt if you modify this list.
|
||||
* */
|
||||
static const char *domain_list[] = {
|
||||
"GENERAL", "CRYPTO", "NET", "CONFIG", "FS", "PROTOCOL", "MM",
|
||||
"HTTP", "APP", "CONTROL", "CIRC", "REND", "BUG", "DIR", "DIRSERV",
|
||||
|
|
Loading…
Reference in New Issue