Use uniform snake case in the configs, fix critical issue with wrong

calculation of workers in stack at the Destroy stage

4 files changed, 28 insertions, 28 deletions

diff --git a/tests/plugins/reload/configs/.rr-reload-2.yaml b/tests/plugins/reload/configs/.rr-reload-2.yaml
index ab32b2d1..882ab628 100644
--- a/tests/plugins/reload/configs/.rr-reload-2.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-2.yaml
@@ -5,11 +5,11 @@ server:
   env:
     RR_HTTP: 'true'
   relay: pipes
-  relayTimeout: 20s
+  relay_timeout: 20s
 http:
   debug: true
   address: '127.0.0.1:27388'
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware:
     - ''
   uploads:
@@ -17,7 +17,7 @@ http:
       - .php
       - .exe
       - .bat
-  trustedSubnets:
+  trusted_subnets:
     - 10.0.0.0/8
     - 127.0.0.0/8
     - 172.16.0.0/12
@@ -26,10 +26,10 @@ http:
     - 'fc00::/7'
     - 'fe80::/10'
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/reload/configs/.rr-reload-3.yaml b/tests/plugins/reload/configs/.rr-reload-3.yaml
index 881d9b88..4f964609 100644
--- a/tests/plugins/reload/configs/.rr-reload-3.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-3.yaml
@@ -5,11 +5,11 @@ server:
   env:
     RR_HTTP: 'true'
   relay: pipes
-  relayTimeout: 20s
+  relay_timeout: 20s
 http:
   debug: true
   address: '127.0.0.1:37388'
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware:
     - ''
   uploads:
@@ -17,7 +17,7 @@ http:
       - .php
       - .exe
       - .bat
-  trustedSubnets:
+  trusted_subnets:
     - 10.0.0.0/8
     - 127.0.0.0/8
     - 172.16.0.0/12
@@ -26,10 +26,10 @@ http:
     - 'fc00::/7'
     - 'fe80::/10'
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/reload/configs/.rr-reload-4.yaml b/tests/plugins/reload/configs/.rr-reload-4.yaml
index d47df558..76966e49 100644
--- a/tests/plugins/reload/configs/.rr-reload-4.yaml
+++ b/tests/plugins/reload/configs/.rr-reload-4.yaml
@@ -5,11 +5,11 @@ server:
   env:
     RR_HTTP: 'true'
   relay: pipes
-  relayTimeout: 20s
+  relay_timeout: 20s
 http:
   debug: true
   address: '127.0.0.1:22766'
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware:
     - ''
   uploads:
@@ -17,7 +17,7 @@ http:
       - .php
       - .exe
       - .bat
-  trustedSubnets:
+  trusted_subnets:
     - 10.0.0.0/8
     - 127.0.0.0/8
     - 172.16.0.0/12
@@ -26,10 +26,10 @@ http:
     - 'fc00::/7'
     - 'fe80::/10'
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error
diff --git a/tests/plugins/reload/configs/.rr-reload.yaml b/tests/plugins/reload/configs/.rr-reload.yaml
index 794c41f2..5dfb1171 100644
--- a/tests/plugins/reload/configs/.rr-reload.yaml
+++ b/tests/plugins/reload/configs/.rr-reload.yaml
@@ -5,11 +5,11 @@ server:
   env:
     RR_HTTP: 'true'
   relay: pipes
-  relayTimeout: 20s
+  relay_timeout: 20s
 http:
   debug: true
   address: '127.0.0.1:22388'
-  maxRequestSize: 1024
+  max_request_size: 1024
   middleware:
     - ''
   uploads:
@@ -17,7 +17,7 @@ http:
       - .php
       - .exe
       - .bat
-  trustedSubnets:
+  trusted_subnets:
     - 10.0.0.0/8
     - 127.0.0.0/8
     - 172.16.0.0/12
@@ -26,10 +26,10 @@ http:
     - 'fc00::/7'
     - 'fe80::/10'
   pool:
-    numWorkers: 2
-    maxJobs: 0
-    allocateTimeout: 60s
-    destroyTimeout: 60s
+    num_workers: 2
+    max_jobs: 0
+    allocate_timeout: 60s
+    destroy_timeout: 60s
 logs:
   mode: development
   level: error