aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-12-01 03:24:03 +0200
committerNick Mathewson <nickm@torproject.org>2011-02-22 12:40:36 -0500
commit098b6ba72d636cf00cfa091e745c25a649fba493 (patch)
tree76d4890c31b79fc686d1d79f6440b11d88a9adbc /doc/tor.1.txt
parent0ba69714b4c51bfddcce16b7e1b309fad4e3e3bc (diff)
downloadtor-098b6ba72d636cf00cfa091e745c25a649fba493.tar.gz
tor-098b6ba72d636cf00cfa091e745c25a649fba493.zip
Initial heartbeat subsystem commit.
Sets: * Documentation * Logging domain * Configuration option * Scheduled event * Makefile It also creates status.c and the log_heartbeat() function. All code was written by Sebastian Hahn. Commit message was written by me (George Kadianakis).
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index bc18b2fbfa..9020a8028a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -928,6 +928,10 @@ is non-zero):
seconds, we exit. If we get a second SIGINT, we exit immedi-
ately. (Default: 30 seconds)
+**HeartbeatPeriod** __N__ **minutes**|**hours**|**days**|**weeks**::
+ Log a heartbeat message every **HeartbeatPeriod** seconds. This is
+ a log level __info__ message, designed to let you know your Tor
+ instance is still alive and doing useful things. (Default: 6 hours)
**AccountingMax** __N__ **bytes**|**KB**|**MB**|**GB**|**TB**::
Never send more than the specified number of bytes in a given accounting