use num_workers in pool instead of min/max/spare servers

We've got to clean up the connection pool code, too...

diff --git a/raddb/mods-available/cache b/raddb/mods-available/cache
index db2bad92ffca3dc48e53483f95415335f0c6fe5e..93b35a07fdad23e9b52c3a8d94aff0af0b3b9eaf 100644 (file)
--- a/raddb/mods-available/cache
+++ b/raddb/mods-available/cache
@@ -47,9 +47,9 @@ cache {
 #              options = "--SERVER=localhost"
 #
 #              pool {
-#                      start = ${thread[pool].start_servers}
-#                      min = ${thread[pool].min_spare_servers}
-#                      max = ${thread[pool].max_servers}
+#                      start = ${thread[pool].num_workers}
+#                      min = ${thread[pool].num_workers}
+#                      max = ${thread[pool].num_workers}
 #                      spare = ${thread[pool].max_spare_servers}
 #                      uses = 0
 #                      lifetime = 0
@@ -84,9 +84,9 @@ cache {
 #              database = 0
 #
 #              pool {
-#                      start = ${thread[pool].start_servers}
-#                      min = ${thread[pool].min_spare_servers}
-#                      max = ${thread[pool].max_servers}
+#                      start = ${thread[pool].num_workers}
+#                      min = ${thread[pool].num_workers}
+#                      max = ${thread[pool].num_workers}
 #                      spare = ${thread[pool].max_spare_servers}
 #                      uses = 0
 #                      lifetime = 0

diff --git a/raddb/mods-available/couchbase b/raddb/mods-available/couchbase
index 075a3b17b47e92852e107b690b904160bcf2ab23..71a29f9798613fc9552125b7942760b75ba788f9 100644 (file)
--- a/raddb/mods-available/couchbase
+++ b/raddb/mods-available/couchbase
@@ -124,10 +124,10 @@ couchbase {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  couchbase being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -140,7 +140,7 @@ couchbase {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/krb5 b/raddb/mods-available/krb5
index 3b7e16ddc86c3980d5f509387008fc36d736f015..27ff3bc4928d3b115b4cfffe743c82f716c05cb8 100644 (file)
--- a/raddb/mods-available/krb5
+++ b/raddb/mods-available/krb5
@@ -23,10 +23,10 @@ krb5 {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  KDC being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -39,7 +39,7 @@ krb5 {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/ldap b/raddb/mods-available/ldap
index 24b9c7bd6a63a3a374aac772cac2717f395408c7..abf0882d3eab672e1cfb65df4882f9ab7d89c123 100644 (file)
--- a/raddb/mods-available/ldap
+++ b/raddb/mods-available/ldap
@@ -498,10 +498,10 @@ ldap {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  directory being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -514,7 +514,7 @@ ldap {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/linelog b/raddb/mods-available/linelog
index 2183af83fa98c023a602c9da6f5d9940a8b88462..8ccfdbffad7bc0200a89652df0d8672cea92437f 100644 (file)
--- a/raddb/mods-available/linelog
+++ b/raddb/mods-available/linelog
@@ -105,10 +105,10 @@ linelog {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  web service being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -121,7 +121,7 @@ linelog {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/mschap b/raddb/mods-available/mschap
index 626756c6dcf8c16a210ec08e52402fc2496529d4..47f02613719a89b349fd8d797d1a34ba52276066 100644 (file)
--- a/raddb/mods-available/mschap
+++ b/raddb/mods-available/mschap
@@ -104,10 +104,10 @@ mschap {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  winbind daemon being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -120,7 +120,7 @@ mschap {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/redis b/raddb/mods-available/redis
index f497f8096d393955c0608f5e101a1454188ac816..0f3bb35e8e9c016ff8343c3a529010a60c7a0b30 100644 (file)
--- a/raddb/mods-available/redis
+++ b/raddb/mods-available/redis
@@ -42,10 +42,10 @@ redis {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  web service being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -58,7 +58,7 @@ redis {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/redis_ippool b/raddb/mods-available/redis_ippool
index 8c04f9ce78518e9a85c9405f9464371b509953e9..6dc06e9c92c2f33ddad1392bc92dfc9c1cc69780 100644 (file)
--- a/raddb/mods-available/redis_ippool
+++ b/raddb/mods-available/redis_ippool
@@ -76,8 +76,8 @@ redis_ippool {
 
                pool {
                        start = 0
-                       min = ${thread[pool].min_spare_servers}
-                       max = ${thread[pool].max_servers}
+                       min = ${thread[pool].num_workers}
+                       max = ${thread[pool].num_workers}
                        spare = ${thread[pool].max_spare_servers}
                        uses = 0
                        lifetime = 0

diff --git a/raddb/mods-available/rest b/raddb/mods-available/rest
index 33c8d4db090ef4b80b7c90dcff92ae135c92f31a..4c97324ec0172cb2cf816363368ca6560f440200 100644 (file)
--- a/raddb/mods-available/rest
+++ b/raddb/mods-available/rest
@@ -200,10 +200,10 @@ rest {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  web service being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -216,7 +216,7 @@ rest {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/sql b/raddb/mods-available/sql
index 56f627106734dca7ad699c7a947c041e75e84ff7..8d961577051353941b582d6ca8e86ed40d9d43f4 100644 (file)
--- a/raddb/mods-available/sql
+++ b/raddb/mods-available/sql
@@ -137,10 +137,10 @@ sql {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  database being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -153,7 +153,7 @@ sql {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/winbind b/raddb/mods-available/winbind
index 8d2d970d78660f8bef11a7a72dcc904423380fad..02ab910d99dfad305af27b16f450f460330332e6 100644 (file)
--- a/raddb/mods-available/winbind
+++ b/raddb/mods-available/winbind
@@ -69,10 +69,10 @@ winbind {
                #  connections during instantiation it will exit.
                #  Set to 0 to allow the server to start without the
                #  winbind daemon being available.
-               start = ${thread[pool].start_servers}
+               start = ${thread[pool].num_workers}
 
                #  Minimum number of connections to keep open
-               min = ${thread[pool].min_spare_servers}
+               min = ${thread[pool].num_workers}
 
                #  Maximum number of connections
                #
@@ -85,7 +85,7 @@ winbind {
                #
                #  Setting 'max' to MORE than the number of threads means
                #  that there are more connections than necessary.
-               max = ${thread[pool].max_servers}
+               max = ${thread[pool].num_workers}
 
                #  Spare connections to be left idle
                #

diff --git a/raddb/mods-available/yubikey b/raddb/mods-available/yubikey
index 38ac6af72b477cefefa066c9bb7e57be37d5c5c5..f1d4f3a3be7b92258fdb6a474449d0d5b186c0cc 100644 (file)
--- a/raddb/mods-available/yubikey
+++ b/raddb/mods-available/yubikey
@@ -127,10 +127,10 @@ yubikey {
                        #  connections during instantiation it will exit.
                        #  Set to 0 to allow the server to start without the
                        #  yubikey server being available.
-                       start = ${thread[pool].start_servers}
+                       start = ${thread[pool].num_workers}
 
                        #  Minimum number of connections to keep open
-                       min = ${thread[pool].min_spare_servers}
+                       min = ${thread[pool].num_workers}
 
                        #  Maximum number of connections
                        #
@@ -143,7 +143,7 @@ yubikey {
                        #
                        #  Setting 'max' to MORE than the number of threads means
                        #  that there are more connections than necessary.
-                       max = ${thread[pool].max_servers}
+                       max = ${thread[pool].num_workers}
 
                        #  Number of uses before the connection is closed
                        #