projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| cc8f79f9 MF |
1 | ------------------------------------------------------------ |
| 2 | revno: 14101 | |
| 3 | revision-id: squid3@treenet.co.nz-20161025082349-4gds2nic8qcahkem | |
| 4 | parent: squid3@treenet.co.nz-20161025081949-3sxzd0n4snmadlke | |
| 5 | committer: Amos Jeffries <squid3@treenet.co.nz> | |
| 6 | branch nick: 3.5 | |
| 7 | timestamp: Tue 2016-10-25 21:23:49 +1300 | |
| 8 | message: | |
| 9 | Fix external_acl_type default children documentations | |
| 10 | ||
| 11 | The max children has always been 5, not 20. | |
| 12 | ||
| 13 | Also, make mgr:config report dumper actually hide only the real default | |
| 14 | values. (sync with helper/ChildConfig.cc defaults) | |
| 15 | ------------------------------------------------------------ | |
| 16 | # Bazaar merge directive format 2 (Bazaar 0.90) | |
| 17 | # revision_id: squid3@treenet.co.nz-20161025082349-4gds2nic8qcahkem | |
| 18 | # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
| 19 | # testament_sha1: 02234eff0589032ea31d911c20f792617eeb18a9 | |
| 20 | # timestamp: 2016-10-25 08:28:32 +0000 | |
| 21 | # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 | |
| 22 | # base_revision_id: squid3@treenet.co.nz-20161025081949-\ | |
| 23 | # 3sxzd0n4snmadlke | |
| 24 | # | |
| 25 | # Begin patch | |
| 26 | === modified file 'src/cf.data.pre' | |
| 27 | --- src/cf.data.pre 2016-09-23 15:28:42 +0000 | |
| 28 | +++ src/cf.data.pre 2016-10-25 08:23:49 +0000 | |
| 29 | @@ -678,7 +678,7 @@ | |
| 30 | ||
| 31 | children-max=n | |
| 32 | Maximum number of acl helper processes spawned to service | |
| 33 | - external acl lookups of this type. (default 20) | |
| 34 | + external acl lookups of this type. (default 5) | |
| 35 | ||
| 36 | children-startup=n | |
| 37 | Minimum number of acl helper processes to spawn during | |
| 38 | ||
| 39 | === modified file 'src/external_acl.cc' | |
| 40 | --- src/external_acl.cc 2016-05-17 18:14:16 +0000 | |
| 41 | +++ src/external_acl.cc 2016-10-25 08:23:49 +0000 | |
| 42 | @@ -474,13 +474,13 @@ | |
| 43 | if (node->children.n_max != DEFAULT_EXTERNAL_ACL_CHILDREN) | |
| 44 | storeAppendPrintf(sentry, " children-max=%d", node->children.n_max); | |
| 45 | ||
| 46 | - if (node->children.n_startup != 1) | |
| 47 | + if (node->children.n_startup != 0) // sync with helper/ChildConfig.cc default | |
| 48 | storeAppendPrintf(sentry, " children-startup=%d", node->children.n_startup); | |
| 49 | ||
| 50 | - if (node->children.n_idle != (node->children.n_max + node->children.n_startup) ) | |
| 51 | + if (node->children.n_idle != 1) // sync with helper/ChildConfig.cc default | |
| 52 | storeAppendPrintf(sentry, " children-idle=%d", node->children.n_idle); | |
| 53 | ||
| 54 | - if (node->children.concurrency) | |
| 55 | + if (node->children.concurrency != 0) | |
| 56 | storeAppendPrintf(sentry, " concurrency=%d", node->children.concurrency); | |
| 57 | ||
| 58 | if (node->cache) | |
| 59 |