diff options
| -rw-r--r-- | .rr.yaml | 41 | ||||
| -rw-r--r-- | schemas/config/2.0.schema.json | 36 |
2 files changed, 33 insertions, 44 deletions
@@ -426,18 +426,18 @@ kv: sentinel_password: "" route_by_latency: false route_randomly: false - dial_timeout: 0 # accepted values [1s, 5m, 3h] + dial_timeout: 0s # accepted values [1s, 5m, 3h] max_retries: 1 - min_retry_backoff: 0 # accepted values [1s, 5m, 3h] - max_retry_backoff: 0 # accepted values [1s, 5m, 3h] + min_retry_backoff: 0s # accepted values [1s, 5m, 3h] + max_retry_backoff: 0s # accepted values [1s, 5m, 3h] pool_size: 0 min_idle_conns: 0 - max_conn_age: 0 # accepted values [1s, 5m, 3h] - read_timeout: 0 # accepted values [1s, 5m, 3h] - write_timeout: 0 # accepted values [1s, 5m, 3h] - pool_timeout: 0 # accepted values [1s, 5m, 3h] - idle_timeout: 0 # accepted values [1s, 5m, 3h] - idle_check_freq: 0 # accepted values [1s, 5m, 3h] + max_conn_age: 0s # accepted values [1s, 5m, 3h] + read_timeout: 0s # accepted values [1s, 5m, 3h] + write_timeout: 0s # accepted values [1s, 5m, 3h] + pool_timeout: 0s # accepted values [1s, 5m, 3h] + idle_timeout: 0s # accepted values [1s, 5m, 3h] + idle_check_freq: 0s # accepted values [1s, 5m, 3h] read_only: false # User defined name of the section @@ -459,6 +459,7 @@ kv: # Service plugin settings service: + # User defined service name # # Default: none, required @@ -483,7 +484,7 @@ service: # Allowed time before stop. # # Default: 0 (infinity), can be 1s, 2m, 2h (seconds, minutes, hours) - exec_timeout: 0 + exec_timeout: 0s # Show the name of the service in logs (e.g. service.some_service_1) # @@ -530,7 +531,7 @@ service: # Allowed time before stop. # # Default: 0 (infinity), can be 1s, 2m, 2h (seconds, minutes, hours) - exec_timeout: 0 + exec_timeout: 0s # Remain process after exit. In other words, restart process after exit with any exit code. # @@ -1004,18 +1005,18 @@ redis: sentinel_password: "" route_by_latency: false route_randomly: false - dial_timeout: 0 # accepted values [1s, 5m, 3h] + dial_timeout: 0s # accepted values [1s, 5m, 3h] max_retries: 1 - min_retry_backoff: 0 # accepted values [1s, 5m, 3h] - max_retry_backoff: 0 # accepted values [1s, 5m, 3h] + min_retry_backoff: 0s # accepted values [1s, 5m, 3h] + max_retry_backoff: 0s # accepted values [1s, 5m, 3h] pool_size: 0 min_idle_conns: 0 - max_conn_age: 0 # accepted values [1s, 5m, 3h] - read_timeout: 0 # accepted values [1s, 5m, 3h] - write_timeout: 0 # accepted values [1s, 5m, 3h] - pool_timeout: 0 # accepted values [1s, 5m, 3h] - idle_timeout: 0 # accepted values [1s, 5m, 3h] - idle_check_freq: 0 # accepted values [1s, 5m, 3h] + max_conn_age: 0s # accepted values [1s, 5m, 3h] + read_timeout: 0s # accepted values [1s, 5m, 3h] + write_timeout: 0s # accepted values [1s, 5m, 3h] + pool_timeout: 0s # accepted values [1s, 5m, 3h] + idle_timeout: 0s # accepted values [1s, 5m, 3h] + idle_check_freq: 0s # accepted values [1s, 5m, 3h] read_only: false # Application metrics in Prometheus format (docs: https://roadrunner.dev/docs/plugins-metrics/2.x/en). Drop this section diff --git a/schemas/config/2.0.schema.json b/schemas/config/2.0.schema.json index 6ad9b1fb..55c46823 100644 --- a/schemas/config/2.0.schema.json +++ b/schemas/config/2.0.schema.json @@ -1476,7 +1476,7 @@ "type": "boolean", "default": false }, - "queue_headers" : { + "queue_headers": { "description": "Queue declare args, associated array (hashmap, key:val)", "$ref": "#/definitions/Hashmap", "default": null @@ -2040,11 +2040,11 @@ "default": 1 }, "min_retry_backoff": { - "type": "integer", + "$ref": "#/definitions/Duration", "default": 0 }, "max_retry_backoff": { - "type": "integer", + "$ref": "#/definitions/Duration", "default": 0 }, "pool_size": { @@ -2110,7 +2110,7 @@ }, "exec_timeout": { "description": "Allowed time before stop", - "type": "integer", + "type": "string", "$ref": "#/definitions/Duration" }, "remain_after_exit": { @@ -2231,26 +2231,14 @@ }, "Duration": { "description": "Time duration", - "anyOf": [ - { - "description": "Duration as a string. Valid time units are 'ns', 'us' (or 'µs'), 'ms', 's', 'm', 'h'", - "type": "string", - "examples": [ - "10h", - "1m", - "1h10m10s", - "30s", - "300ms", - "1µs", - "1us" - ], - "minLength": 2 - }, - { - "description": "Duration in nanoseconds", - "type": "integer", - "minimum": 0 - } + "type": "string", + "pattern": "^[0-9]+[ms]|[s,h]", + "examples": [ + "10h", + "1m", + "1h", + "30s", + "300ms" ] }, "HostAndPortWithTCP": { |