guoqqqi commented on a change in pull request #1733:
URL: https://github.com/apache/apisix-dashboard/pull/1733#discussion_r612054702
##########
File path: web/src/components/Plugin/locales/en-US.ts
##########
@@ -21,6 +21,19 @@ export default {
'component.step.select.pluginTemplate.select.option': 'Custom',
'component.plugin.pluginTemplate.tip1': '1. When a route already have
plugins field configured, the plugins in the plugin template will be merged
into it.',
'component.plugin.pluginTemplate.tip2': '2. The same plugin in the plugin
template will override one in the plugins',
+ // cors
'component.pluginForm.cors.allow_credential.tooltip': 'If you set this
option to true, you can not use \'*\' for other options.',
'component.pluginForm.cors.max_age.tooltip': 'Maximum number of seconds the
results can be cached.. Within this time range, the browser will reuse the last
check result. -1 means no cache.',
+
+ // limit-conn
+ 'component.pluginForm.limit-conn.conn.tooltip': 'the maximum number of
concurrent requests allowed. Requests exceeding this ratio (and below conn +
burst) will get delayed(the latency seconds is configured by
default_conn_delay) to conform to this threshold.',
+ 'component.pluginForm.limit-conn.burst.tooltip': 'the number of excessive
concurrent requests (or connections) allowed to be delayed.',
+ 'component.pluginForm.limit-conn.default_conn_delay.tooltip': 'the latency
seconds of request when concurrent requests exceeding conn but below (conn +
burst).',
+ 'component.pluginForm.limit-conn.key.tooltip': 'to limit the concurrency
level.For example, one can use the host name (or server zone) as the key so
that we limit concurrency per host name. Otherwise, we can also use the client
address as the key so that we can avoid a single client from flooding our
service with too many parallel connections or requests.Now accept those as key:
"remote_addr"(client\'s IP), "server_addr"(server\'s IP),
"X-Forwarded-For/X-Real-IP" in request header, "consumer_name"(consumer\'s
username).',
+ 'component.pluginForm.limit-conn.rejected_code.tooltip': 'returned when the
request exceeds conn + burst will be rejected.',
+
+ 'component.plugin.form': 'Form',
+ 'component.plugin.format-codes.disable': 'Format JSON or YAML data',
Review comment:
These files are conflicting files, generated after conflict resolution.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
