From 8b70fb48b2b0a9451d9b82a17ac2f4cd8a1f561e Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 10 Sep 2021 15:21:06 +0300 Subject: Add docs folder Signed-off-by: Valery Piashchynski --- tests/plugins/broadcast/configs/.rr-broadcast-global.yaml | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/plugins/broadcast') diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml index 5ae5a101..3216f875 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml @@ -24,6 +24,7 @@ redis: broadcast: test: driver: redis + use: global test2: driver: redis addrs: -- cgit v1.2.3 From e94a80d4586d5a5fedc2edab850c5c8bad93395f Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 10 Sep 2021 19:05:37 +0300 Subject: fix issue with incorrectly parsing local and global configuration Signed-off-by: Valery Piashchynski --- .../configs/.rr-broadcast-config-error.yaml | 1 + .../broadcast/configs/.rr-broadcast-global.yaml | 72 +++++++++++++--------- .../broadcast/configs/.rr-broadcast-init.yaml | 5 +- .../configs/.rr-broadcast-same-section.yaml | 69 +++++++++++++-------- 4 files changed, 88 insertions(+), 59 deletions(-) (limited to 'tests/plugins/broadcast') diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-config-error.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-config-error.yaml index 66114d64..1474feb7 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-config-error.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-config-error.yaml @@ -17,6 +17,7 @@ http: allocate_timeout: 60s destroy_timeout: 60s +# no global or local config broadcast: default: driver: redis diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml index 3216f875..c193af00 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml @@ -1,40 +1,52 @@ rpc: - listen: tcp://127.0.0.1:6003 + listen: tcp://127.0.0.1:6003 server: - command: "php ../../psr-worker-bench.php" - relay: "pipes" - relay_timeout: "20s" + command: "php ../../psr-worker-bench.php" + relay: "pipes" + relay_timeout: "20s" http: - address: 127.0.0.1:21543 - max_request_size: 1024 - middleware: [ "websockets" ] - trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ] - pool: - num_workers: 2 - max_jobs: 0 - allocate_timeout: 60s - destroy_timeout: 60s + address: 127.0.0.1:21543 + max_request_size: 1024 + middleware: ["websockets"] + trusted_subnets: + [ + "10.0.0.0/8", + "127.0.0.0/8", + "172.16.0.0/12", + "192.168.0.0/16", + "::1/128", + "fc00::/7", + "fe80::/10", + ] + pool: + num_workers: 2 + max_jobs: 0 + allocate_timeout: 60s + destroy_timeout: 60s -redis: - addrs: - - "127.0.0.1:6379" - -broadcast: - test: - driver: redis - use: global - test2: - driver: redis +test: addrs: - - "127.0.0.1:6378" - test3: - driver: memory - test4: - driver: memory + - "127.0.0.1:6379" +broadcast: + test: + driver: redis + test2: + driver: redis + config: + addrs: + - "127.0.0.1:6378" + test3: + driver: memory + config: + placeholder: "" + test4: + driver: memory + config: + placeholder: "" logs: - mode: development - level: info + mode: development + level: info diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-init.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-init.yaml index d8457578..1cbebdd7 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-init.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-init.yaml @@ -22,8 +22,9 @@ http: broadcast: default: driver: redis - addrs: - - "127.0.0.1:6379" + config: + addrs: + - "127.0.0.1:6379" logs: mode: development diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml index 2337b8fe..f162aeba 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml @@ -1,36 +1,51 @@ rpc: - listen: tcp://127.0.0.1:6002 + listen: tcp://127.0.0.1:6002 server: - command: "php ../../psr-worker-bench.php" - relay: "pipes" - relay_timeout: "20s" + command: "php ../../psr-worker-bench.php" + relay: "pipes" + relay_timeout: "20s" http: - address: 127.0.0.1:21345 - max_request_size: 1024 - middleware: [ "websockets" ] - trusted_subnets: [ "10.0.0.0/8", "127.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16", "::1/128", "fc00::/7", "fe80::/10" ] - pool: - num_workers: 2 - max_jobs: 0 - allocate_timeout: 60s - destroy_timeout: 60s + address: 127.0.0.1:21345 + max_request_size: 1024 + middleware: ["websockets"] + trusted_subnets: + [ + "10.0.0.0/8", + "127.0.0.0/8", + "172.16.0.0/12", + "192.168.0.0/16", + "::1/128", + "fc00::/7", + "fe80::/10", + ] + pool: + num_workers: 2 + max_jobs: 0 + allocate_timeout: 60s + destroy_timeout: 60s broadcast: - test: - driver: redis - addrs: - - "127.0.0.1:6379" - test2: - driver: redis - addrs: - - "127.0.0.1:6378" - test3: - driver: memory - test4: - driver: memory + test: + driver: redis + config: + addrs: + - "127.0.0.1:6379" + test2: + driver: redis + config: + addrs: + - "127.0.0.1:6378" + test3: + driver: memory + config: + placeholder: "" + test4: + driver: memory + config: + placeholder: "" logs: - mode: development - level: info + mode: development + level: info -- cgit v1.2.3 From a6b6e3e7eef3015fac64fab9f7d4597d913b264d Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 10 Sep 2021 19:39:47 +0300 Subject: Configs update Signed-off-by: Valery Piashchynski --- tests/plugins/broadcast/configs/.rr-broadcast-global.yaml | 4 ---- tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml | 5 ----- 2 files changed, 9 deletions(-) (limited to 'tests/plugins/broadcast') diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml index c193af00..d3cf2306 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml @@ -40,12 +40,8 @@ broadcast: - "127.0.0.1:6378" test3: driver: memory - config: - placeholder: "" test4: driver: memory - config: - placeholder: "" logs: mode: development diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml index f162aeba..b42834a9 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml @@ -39,13 +39,8 @@ broadcast: - "127.0.0.1:6378" test3: driver: memory - config: - placeholder: "" test4: driver: memory - config: - placeholder: "" - logs: mode: development level: info -- cgit v1.2.3 From 0c4dd160a3eec4d76b9b82799c55eea4c5f50629 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Sat, 11 Sep 2021 01:04:05 +0300 Subject: Update .vscode settings Update codecov Update configs Signed-off-by: Valery Piashchynski --- tests/plugins/broadcast/configs/.rr-broadcast-global.yaml | 2 ++ tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml | 2 ++ 2 files changed, 4 insertions(+) (limited to 'tests/plugins/broadcast') diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml index d3cf2306..a7f9c35d 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-global.yaml @@ -40,8 +40,10 @@ broadcast: - "127.0.0.1:6378" test3: driver: memory + config: {} test4: driver: memory + config: {} logs: mode: development diff --git a/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml b/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml index b42834a9..85a767cb 100644 --- a/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml +++ b/tests/plugins/broadcast/configs/.rr-broadcast-same-section.yaml @@ -39,8 +39,10 @@ broadcast: - "127.0.0.1:6378" test3: driver: memory + config: {} test4: driver: memory + config: {} logs: mode: development level: info -- cgit v1.2.3