From: Amos Jeffries Date: Mon, 24 Oct 2016 06:46:02 +0000 (+1300) Subject: Fix external_acl_type default children documentations X-Git-Tag: SQUID_4_0_16~16 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ccfb9a74e3a4f63b21dc4cb6d9335421fc9968c;p=thirdparty%2Fsquid.git Fix external_acl_type default children documentations The max children has always been 5, not 20. Also, make mgr:config report dumper actually hide only the real default values. (sync with helper/ChildConfig.cc defaults) --- diff --git a/src/cf.data.pre b/src/cf.data.pre index 7319ccedcc..0cda978351 100644 --- a/src/cf.data.pre +++ b/src/cf.data.pre @@ -810,7 +810,7 @@ DOC_START children-max=n Maximum number of acl helper processes spawned to service - external acl lookups of this type. (default 20) + external acl lookups of this type. (default 5) children-startup=n Minimum number of acl helper processes to spawn during diff --git a/src/external_acl.cc b/src/external_acl.cc index 779c3b2c69..4a20ae9336 100644 --- a/src/external_acl.cc +++ b/src/external_acl.cc @@ -378,13 +378,13 @@ dump_externalAclHelper(StoreEntry * sentry, const char *name, const external_acl if (node->children.n_max != DEFAULT_EXTERNAL_ACL_CHILDREN) storeAppendPrintf(sentry, " children-max=%d", node->children.n_max); - if (node->children.n_startup != 1) + if (node->children.n_startup != 0) // sync with helper/ChildConfig.cc default storeAppendPrintf(sentry, " children-startup=%d", node->children.n_startup); - if (node->children.n_idle != (node->children.n_max + node->children.n_startup) ) + if (node->children.n_idle != 1) // sync with helper/ChildConfig.cc default storeAppendPrintf(sentry, " children-idle=%d", node->children.n_idle); - if (node->children.concurrency) + if (node->children.concurrency != 0) storeAppendPrintf(sentry, " concurrency=%d", node->children.concurrency); if (node->cache)