vrr/g3
2
0
Fork 0
mirror of https://github.com/bytedance/g3.git synced 2026-05-03 06:00:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

g3proxy: make listen config optional in real servers

Browse source
This commit is contained in:
Zhang Jingqiang 2023-08-02 15:46:05 +08:00
parent 6a16ba7f6e
commit 067ea8e8e8
23 changed files with 160 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

14
g3proxy/doc/configuration/servers/http_proxy.rst
View file

@ -11,7 +11,6 @@ The following common keys are supported:
* :ref:`auditor <conf_server_common_auditor>`
* :ref:`user_group <conf_server_common_user_group>`
* :ref:`shared_logger <conf_server_common_shared_logger>`
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`tls_server <conf_server_common_tls_server>`
* :ref:`tcp_sock_speed_limit <conf_server_common_tcp_sock_speed_limit>`
@ -35,6 +34,19 @@ The auth scheme supported by the server is determined by the type of the specifi
|Negotiate |gss_api |not yet |
+-------------+---------------------------+-------------------+
listen
------
**optional**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
**default**: not set
.. versionadded:: 1.7.20 change listen config to be optional
.. _config_server_http_proxy_server_id:
server_id

14
g3proxy/doc/configuration/servers/http_rproxy.rst
View file

@ -11,7 +11,6 @@ The following common keys are supported:
* :ref:`auditor <conf_server_common_auditor>`
* :ref:`user_group <conf_server_common_user_group>`
* :ref:`shared_logger <conf_server_common_shared_logger>`
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`tcp_sock_speed_limit <conf_server_common_tcp_sock_speed_limit>`
* :ref:`ingress_network_filter <conf_server_common_ingress_network_filter>`
@ -32,6 +31,19 @@ The auth scheme supported by the server is determined by the type of the specifi
|Negotiate |gss_api |not yet |
+-------------+---------------------------+-------------------+
listen
------
**optional**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
**default**: not set
.. versionadded:: 1.7.20 change listen config to be optional
.. _config_server_http_rproxy_server_id:
server_id

2
g3proxy/doc/configuration/servers/index.rst
View file

@ -81,8 +81,6 @@ Set the server to use a logger running on a shared thread.
**default**: not set
.. _conf_server_common_listen:
listen
------

10
g3proxy/doc/configuration/servers/intelli_proxy.rst
View file

@ -7,10 +7,18 @@ Intelligent Proxy port, it will do protocol detection and then send to other ser
The following common keys are supported:
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`ingress_network_filter <conf_server_common_ingress_network_filter>`
listen
------
**required**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
http_server
-----------

10
g3proxy/doc/configuration/servers/plain_tcp_port.rst
View file

@ -7,10 +7,18 @@ This server provides plain tcp port, which can be placed in front of other serve
The following common keys are supported:
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`ingress_network_filter <conf_server_common_ingress_network_filter>`
listen
------
**required**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
server
------

10
g3proxy/doc/configuration/servers/plain_tls_port.rst
View file

@ -7,13 +7,21 @@ This server provides plain tls port, which can be placed in front of other serve
The following common keys are supported:
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`ingress_network_filter <conf_server_common_ingress_network_filter>`
* :ref:`tls_server <conf_server_common_tls_server>`
This is required for this server.
listen
------
**required**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
server
------

14
g3proxy/doc/configuration/servers/sni_proxy.rst
View file

@ -10,7 +10,6 @@ The following common keys are supported:
* :ref:`escaper <conf_server_common_escaper>`
* :ref:`auditor <conf_server_common_auditor>`
* :ref:`shared_logger <conf_server_common_shared_logger>`
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`tcp_sock_speed_limit <conf_server_common_tcp_sock_speed_limit>`
* :ref:`ingress_network_filter <conf_server_common_ingress_network_filter>`
@ -21,6 +20,19 @@ The following common keys are supported:
* :ref:`task_idle_max_count <conf_server_common_task_idle_max_count>`
* :ref:`extra_metrics_tags <conf_server_common_extra_metrics_tags>`
listen
------
**optional**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
**default**: not set
.. versionadded:: 1.7.20 change listen config to be optional
request_wait_timeout
--------------------

14
g3proxy/doc/configuration/servers/socks_proxy.rst
View file

@ -11,7 +11,6 @@ The following common keys are supported:
* :ref:`auditor <conf_server_common_auditor>`
* :ref:`user_group <conf_server_common_user_group>`
* :ref:`shared_logger <conf_server_common_shared_logger>`
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`tcp_sock_speed_limit <conf_server_common_tcp_sock_speed_limit>`
* :ref:`udp_sock_speed_limit <conf_server_common_udp_sock_speed_limit>`
@ -38,6 +37,19 @@ The auth type supported by the server is determined by the type of the specified
|gssapi |gss_api |not yet |
+-------------+---------------------------+-------------------+
listen
------
**optional**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
**default**: not set
.. versionadded:: 1.7.20 change listen config to be optional
use_udp_associate
-----------------

14
g3proxy/doc/configuration/servers/tcp_stream.rst
View file

@ -10,7 +10,6 @@ The following common keys are supported:
* :ref:`escaper <conf_server_common_escaper>`
* :ref:`auditor <conf_server_common_auditor>`
* :ref:`shared_logger <conf_server_common_shared_logger>`
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`tcp_sock_speed_limit <conf_server_common_tcp_sock_speed_limit>`
* :ref:`ingress_network_filter <conf_server_common_ingress_network_filter>`
@ -21,6 +20,19 @@ The following common keys are supported:
* :ref:`task_idle_max_count <conf_server_common_task_idle_max_count>`
* :ref:`extra_metrics_tags <conf_server_common_extra_metrics_tags>`
listen
------
**optional**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
**default**: not set
.. versionadded:: 1.7.20 change listen config to be optional
upstream
--------

14
g3proxy/doc/configuration/servers/tls_stream.rst
View file

@ -10,7 +10,6 @@ The following common keys are supported:
* :ref:`escaper <conf_server_common_escaper>`
* :ref:`auditor <conf_server_common_auditor>`
* :ref:`shared_logger <conf_server_common_shared_logger>`
* :ref:`listen <conf_server_common_listen>`
* :ref:`listen_in_worker <conf_server_common_listen_in_worker>`
* :ref:`tls_server <conf_server_common_tls_server>`
@ -25,6 +24,19 @@ The following common keys are supported:
* :ref:`task_idle_max_count <conf_server_common_task_idle_max_count>`
* :ref:`extra_metrics_tags <conf_server_common_extra_metrics_tags>`
listen
------
**optional**, **type**: :ref:`tcp listen <conf_value_tcp_listen>`
Set the listen config for this server.
The instance count setting will be ignored if *listen_in_worker* is correctly enabled.
**default**: not set
.. versionadded:: 1.7.20 change listen config to be optional
upstream
--------