summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-11-09 12:22:25 -0600
committerSol Jerome <sol.jerome@gmail.com>2014-11-09 12:22:25 -0600
commit389ce1a86b704222ddc9458cd49c281e7601b803 (patch)
treec6f7816fdeeef2e50def72d926536482291a9f53 /doc
parent15f1b3eeebc01faeb41cea1b0649a9fac11d624c (diff)
parent3ba7ad8d4dd5049273f5005b665ebcac0f410ddc (diff)
downloadbcfg2-389ce1a86b704222ddc9458cd49c281e7601b803.tar.gz
bcfg2-389ce1a86b704222ddc9458cd49c281e7601b803.tar.bz2
bcfg2-389ce1a86b704222ddc9458cd49c281e7601b803.zip
Merge branch 'reporting-limit-children' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'doc')
-rw-r--r--doc/man/bcfg2.conf.txt4
-rw-r--r--doc/reports/dynamic.txt3
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 825ab2121..40766b88a 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -716,6 +716,10 @@ Reporting options
web_debug
Turn on Django debugging.
+ max_children
+ Maximum number of children for the reporting collector. Use 0 to
+ disable the limit. (default is 0)
+
See Also
--------
diff --git a/doc/reports/dynamic.txt b/doc/reports/dynamic.txt
index 53bdef24e..38d4c7e3a 100644
--- a/doc/reports/dynamic.txt
+++ b/doc/reports/dynamic.txt
@@ -270,6 +270,9 @@ reporting
* web_prefix: Prefix to be added to Django's MEDIA_URL
* file_limit: The maximum size of a diff or binary data to
store in the database.
+* max_children: Maximum number of children for the reporting
+ collector. Use 0 to disable the limit and spawn a thread
+ as soon as a working file is available.
.. _dynamic_transports: