Skip to content

Commit 5a741ac

Browse files
authored
Remove configuration property key system-log-level (#35493)
* Remove configuration property key system-log-level * Update RELEASE-NOTES.md * Update docs
1 parent d8bdc0c commit 5a741ac

File tree

19 files changed

+77
-118
lines changed

19 files changed

+77
-118
lines changed

RELEASE-NOTES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
### API Changes
1313

1414
1. Remove SQL formatting feature [#35390](https://github.com/apache/shardingsphere/pull/35390)
15+
1. Remove logging rule feature [#35458](https://github.com/apache/shardingsphere/pull/35458)
16+
1. Remove configuration property key `system-log-level` [#35493](https://github.com/apache/shardingsphere/pull/35493)
1517

1618
### New Features
1719

distribution/proxy-native/src/main/assembly/shardingsphere-proxy-native-binary-distribution.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@
3939
<outputDirectory>conf</outputDirectory>
4040
<fileMode>0644</fileMode>
4141
</fileSet>
42+
<fileSet>
43+
<directory>../../proxy/bootstrap/src/main/resources</directory>
44+
<includes>
45+
<include>logback.xml</include>
46+
</includes>
47+
<outputDirectory>conf</outputDirectory>
48+
<fileMode>0644</fileMode>
49+
</fileSet>
4250
<fileSet>
4351
<directory>../../distribution/proxy/src/main/release-docs</directory>
4452
<includes>

distribution/proxy/src/main/assembly/shardingsphere-proxy-binary-distribution.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@
4848
<outputDirectory>conf</outputDirectory>
4949
<fileMode>0644</fileMode>
5050
</fileSet>
51+
<fileSet>
52+
<directory>../../proxy/bootstrap/src/main/resources</directory>
53+
<includes>
54+
<include>logback.xml</include>
55+
</includes>
56+
<outputDirectory>conf</outputDirectory>
57+
<fileMode>0644</fileMode>
58+
</fileSet>
5159
<fileSet>
5260
<directory>src/main/release-docs</directory>
5361
<includes>

docs/document/content/user-manual/shardingsphere-proxy/cdc/build.cn.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ authority:
8787
# port: 6379
8888

8989
props:
90-
system-log-level: INFO
9190
proxy-default-port: 3307 # Proxy default port
9291
cdc-server-port: 33071 # CDC Server 端口,必须配置
9392
proxy-frontend-database-protocol-type: openGauss # 和后端数据库的类型一致

docs/document/content/user-manual/shardingsphere-proxy/cdc/build.en.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ authority:
8686
# port: 6379
8787

8888
props:
89-
system-log-level: INFO
9089
proxy-default-port: 3307 # Proxy default port.
9190
cdc-server-port: 33071 # CDC Server port, must be configured
9291
proxy-frontend-database-protocol-type: openGauss # Consistent with the type of backend database

docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/set-dist-vairable.cn.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ agentPluginsEnabled ::=
3636

3737
- `agent_plugins_enabled``agent` 插件的启用状态,默认值 `FALSE`
3838

39-
- `system_log_level` 为 系统日志等级,仅影响 `PROXY` 的日志打印,默认值 `INFO`
40-
4139
### 示例
4240

4341
- 设置 `Proxy` 属性配置

docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/set-dist-vairable.en.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ agentPluginsEnabled ::=
3535

3636
- `agent_plugins_enabled` is use to set the `agent` plugins enable status, the default value is `FALSE`
3737

38-
- `system_log_level` is the system log level, only affects the log printing of `PROXY`, the default value is `INFO`
39-
4038
### Example
4139

4240
- Set property configuration of `Proxy`

docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-dist-variable.cn.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,31 @@ SHOW DIST VARIABLES;
4848

4949
```sql
5050
mysql> SHOW DIST VARIABLES;
51-
+---------------------------------------+-----------------+
52-
| variable_name | variable_value |
53-
+---------------------------------------+-----------------+
54-
| agent_plugins_enabled | true |
55-
| cached_connections | 0 |
56-
| cdc_server_port | 33071 |
57-
| check_table_metadata_enabled | false |
58-
| kernel_executor_size | 0 |
59-
| max_connections_size_per_query | 1 |
60-
| proxy_backend_query_fetch_size | -1 |
61-
| proxy_default_port | 3307 |
62-
| proxy_frontend_database_protocol_type | |
63-
| proxy_frontend_executor_size | 0 |
64-
| proxy_frontend_flush_threshold | 128 |
65-
| proxy_frontend_max_connections | 0 |
66-
| proxy_frontend_ssl_cipher | |
67-
| proxy_frontend_ssl_enabled | false |
68-
| proxy_frontend_ssl_version | TLSv1.2,TLSv1.3 |
69-
| proxy_meta_data_collector_enabled | true |
70-
| proxy_netty_backlog | 1024 |
71-
| sql_federation_type | NONE |
72-
| sql_show | false |
73-
| sql_simple | false |
74-
| system_log_level | INFO |
75-
+---------------------------------------+-----------------+
51+
+-----------------------------------------+-----------------+
52+
| variable_name | variable_value |
53+
+-----------------------------------------+-----------------+
54+
| agent_plugins_enabled | true |
55+
| cached_connections | 0 |
56+
| cdc_server_port | 33071 |
57+
| check_table_metadata_enabled | false |
58+
| kernel_executor_size | 0 |
59+
| load_table_metadata_batch_size | 1000 |
60+
| max_connections_size_per_query | 1 |
61+
| proxy_backend_query_fetch_size | -1 |
62+
| proxy_default_port | 3307 |
63+
| proxy_frontend_database_protocol_type | |
64+
| proxy_frontend_executor_size | 0 |
65+
| proxy_frontend_flush_threshold | 128 |
66+
| proxy_frontend_max_connections | 0 |
67+
| proxy_frontend_ssl_cipher | |
68+
| proxy_frontend_ssl_enabled | false |
69+
| proxy_frontend_ssl_version | TLSv1.2,TLSv1.3 |
70+
| proxy_meta_data_collector_enabled | false |
71+
| proxy_netty_backlog | 1024 |
72+
| sql_show | false |
73+
| sql_simple | false |
74+
| system_schema_metadata_assembly_enabled | true |
75+
+-----------------------------------------+-----------------+
7676
21 rows in set (0.01 sec)
7777
```
7878

docs/document/content/user-manual/shardingsphere-proxy/distsql/syntax/ral/show-dist-variable.en.md

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,31 @@ SHOW DIST VARIABLES;
4848

4949
```sql
5050
mysql> SHOW DIST VARIABLES;
51-
+---------------------------------------+-----------------+
52-
| variable_name | variable_value |
53-
+---------------------------------------+-----------------+
54-
| agent_plugins_enabled | true |
55-
| cached_connections | 0 |
56-
| cdc_server_port | 33071 |
57-
| check_table_metadata_enabled | false |
58-
| kernel_executor_size | 0 |
59-
| max_connections_size_per_query | 1 |
60-
| proxy_backend_query_fetch_size | -1 |
61-
| proxy_default_port | 3307 |
62-
| proxy_frontend_database_protocol_type | |
63-
| proxy_frontend_executor_size | 0 |
64-
| proxy_frontend_flush_threshold | 128 |
65-
| proxy_frontend_max_connections | 0 |
66-
| proxy_frontend_ssl_cipher | |
67-
| proxy_frontend_ssl_enabled | false |
68-
| proxy_frontend_ssl_version | TLSv1.2,TLSv1.3 |
69-
| proxy_meta_data_collector_enabled | true |
70-
| proxy_netty_backlog | 1024 |
71-
| sql_federation_type | NONE |
72-
| sql_show | false |
73-
| sql_simple | false |
74-
| system_log_level | INFO |
75-
+---------------------------------------+-----------------+
51+
+-----------------------------------------+-----------------+
52+
| variable_name | variable_value |
53+
+-----------------------------------------+-----------------+
54+
| agent_plugins_enabled | true |
55+
| cached_connections | 0 |
56+
| cdc_server_port | 33071 |
57+
| check_table_metadata_enabled | false |
58+
| kernel_executor_size | 0 |
59+
| load_table_metadata_batch_size | 1000 |
60+
| max_connections_size_per_query | 1 |
61+
| proxy_backend_query_fetch_size | -1 |
62+
| proxy_default_port | 3307 |
63+
| proxy_frontend_database_protocol_type | |
64+
| proxy_frontend_executor_size | 0 |
65+
| proxy_frontend_flush_threshold | 128 |
66+
| proxy_frontend_max_connections | 0 |
67+
| proxy_frontend_ssl_cipher | |
68+
| proxy_frontend_ssl_enabled | false |
69+
| proxy_frontend_ssl_version | TLSv1.2,TLSv1.3 |
70+
| proxy_meta_data_collector_enabled | false |
71+
| proxy_netty_backlog | 1024 |
72+
| sql_show | false |
73+
| sql_simple | false |
74+
| system_schema_metadata_assembly_enabled | true |
75+
+-----------------------------------------+-----------------+
7676
21 rows in set (0.01 sec)
7777
```
7878
- Query specified system variable configuration of `PROXY`

docs/document/content/user-manual/shardingsphere-proxy/yaml-config/props.cn.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ Apache ShardingSphere 提供了丰富的系统配置属性,用户可通过 `gl
1212

1313
| *名称* | *数据类型* | *说明* | *默认值* | *动态生效* |
1414
|-------------------------------------------|---------|----------------------------------------------------------------------------------------------------------------------------------------|-----------------|--------|
15-
| system-log-level (?) | String | 系统日志输出级别,支持 DEBUG、INFO、WARN 和 ERROR,默认级别是 INFO。 | INFO ||
1615
| sql-show (?) | boolean | 是否在日志中打印 SQL。 <br /> 打印 SQL 可以帮助开发者快速定位系统问题。日志内容包含:逻辑 SQL,真实 SQL 和 SQL 解析结果。<br /> 如果开启配置,日志将使用 Topic `ShardingSphere-SQL`,日志级别是 INFO。 | false ||
1716
| sql-simple (?) | boolean | 是否在日志中打印简单风格的 SQL。 | false ||
1817
| kernel-executor-size (?) | int | 用于设置任务处理线程池的大小。每个 ShardingSphereDataSource 使用一个独立的线程池,同一个 JVM 的不同数据源不共享线程池。 | infinite ||

0 commit comments

Comments
 (0)