This is an automated email from the ASF dual-hosted git repository.
mxsm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new a43357cff [ISSUE #4686] Shell scripts should preserve LF line endings
(#4687)
a43357cff is described below
commit a43357cffc5882d2f09cd567e3f30ea67df24f1f
Author: Pil0tXia <[email protected]>
AuthorDate: Sat Jan 6 19:16:49 2024 +0800
[ISSUE #4686] Shell scripts should preserve LF line endings (#4687)
* crlf2lf
* convert sh only
* write easily
* Some doc optimization
* minor code change
* add future win scrpts
* add license
---
.gitattributes | 20 ++++++++++++++++++++
eventmesh-connectors/README.md | 1 +
eventmesh-connectors/README_CN.md | 4 +++-
.../eventmesh-connector-mongodb/README_CN.md | 6 +++---
.../eventmesh-connector-rabbitmq/README_CN.md | 12 ++++++------
.../eventmesh-connector-redis/README_CN.md | 2 +-
.../protocol/http/push/AsyncHTTPPushRequest.java | 3 +--
7 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..b27bb300d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+*.sh text eol=lf
+gradlew text eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
\ No newline at end of file
diff --git a/eventmesh-connectors/README.md b/eventmesh-connectors/README.md
index 96caebb26..32c976580 100644
--- a/eventmesh-connectors/README.md
+++ b/eventmesh-connectors/README.md
@@ -3,6 +3,7 @@
## Connector
A connector is an image or instance that interacts with a specific external
service or underlying data source (e.g., Databases) on behalf of user
applications. A connector is either a Source or a Sink.
+
Connector runs as a standalone service by `main()`.
## Source
diff --git a/eventmesh-connectors/README_CN.md
b/eventmesh-connectors/README_CN.md
index a98b539d7..be78a6a3e 100644
--- a/eventmesh-connectors/README_CN.md
+++ b/eventmesh-connectors/README_CN.md
@@ -2,7 +2,9 @@
## 连接器类型
-连接器是代表用户应用程序与特定外部服务或底层数据源（例如数据库）交互的镜像或实例。连接器的类型可以是源（Source）或汇（Sink）。连接器通过
`main()` 作为一个独立服务运行
+连接器是代表用户应用程序与特定外部服务或底层数据源（例如数据库）交互的镜像或实例。连接器的类型可以是源（Source）或汇（Sink）。
+
+连接器通过 `main()` 作为一个独立服务运行。
## 数据源（Source 端）
diff --git a/eventmesh-connectors/eventmesh-connector-mongodb/README_CN.md
b/eventmesh-connectors/eventmesh-connector-mongodb/README_CN.md
index 67695d7b5..028fea6ba 100644
--- a/eventmesh-connectors/eventmesh-connector-mongodb/README_CN.md
+++ b/eventmesh-connectors/eventmesh-connector-mongodb/README_CN.md
@@ -30,7 +30,7 @@ connectorConfig:
## MongoDBSourceConnector：从 MongoDB 到 EventMesh
-1. 启动你的 MongoDB 服务和 EventMesh Runtime。
-2. 启用 sourceConnector 并检查 `source-config.yml`（与 sink-config.yml 基本相同）。
-3. 启动你的 MongoDBSourceConnector，它将订阅到 mongodb 中的
`connectorConfig.collection`，并将数据发送到 EventMesh Runtime 中的
`pubSubConfig.subject`。
+1. 启动你的 MongoDB 服务和 EventMesh Runtime。
+2. 启用 sourceConnector 并检查 `source-config.yml`（与 sink-config.yml 基本相同）。
+3. 启动你的 MongoDBSourceConnector，它将订阅到 MongoDB 中的
`connectorConfig.collection`，并将数据发送到 EventMesh Runtime 中的
`pubSubConfig.subject`。
4. 向 MongoDB 中 `yourDB` 的 `yourCol` 写入一个 CloudEvent 消息，然后你将在 EventMesh 中接收到该消息。
\ No newline at end of file
diff --git a/eventmesh-connectors/eventmesh-connector-rabbitmq/README_CN.md
b/eventmesh-connectors/eventmesh-connector-rabbitmq/README_CN.md
index f807988a6..b2c46aa68 100644
--- a/eventmesh-connectors/eventmesh-connector-rabbitmq/README_CN.md
+++ b/eventmesh-connectors/eventmesh-connector-rabbitmq/README_CN.md
@@ -2,10 +2,10 @@
## RabbitMQSinkConnector：从 EventMesh 到 RabbitMQ
-1. 启动你的 RabbitMQ 服务和 EventMesh Runtime。
+1. 启动你的 RabbitMQ 和 EventMesh Runtime。
2. 启用 sinkConnector 并检查 `sink-config.yml`。
3. 启动你的 RabbitMQConnectorServer，它将订阅到 EventMesh Runtime 中
`pubSubConfig.subject` 中定义的主题，并将数据发送到 RabbitMQ 中的 `connectorConfig.queueName`。
-4. 使用在 `pubSubConfig.subject` 中指定的 Topic，向 EventMesh 发送消息，然后你将在 rabbitmq
中接收到该消息。
+4. 使用在 `pubSubConfig.subject` 中指定的 Topic，向 EventMesh 发送消息，然后你将在 RabbitMQ
中接收到该消息。
```yaml
pubSubConfig:
@@ -26,9 +26,9 @@ connectorConfig:
passwd: passwd
virtualHost: coyrqpyz
exchangeType: TOPIC
- # 使用内置的 exchangeName 或在连接到 rabbitmq 服务后创建新的 exchangeName。
+ # 使用内置的 exchangeName 或在连接到 RabbitMQ 后创建新的 exchangeName。
exchangeName: amq.topic
- # 如果在连接之前不存在，rabbitmq 服务将自动创建 routingKey 和 queueName。
+ # 如果在连接之前不存在，RabbitMQ 将自动创建 routingKey 和 queueName。
routingKey: eventmesh
queueName: eventmesh
autoAck: true
@@ -36,7 +36,7 @@ connectorConfig:
## RabbitMQSourceConnector：从 RabbitMQ 到 EventMesh
-1. 启动你的 RabbitMQ 服务和 EventMesh Runtime。
-2. 启用 sourceConnector 并检查 `source-config.yml`（与 sink-config.yml 基本相同）。
+1. 启动你的 RabbitMQ 和 EventMesh Runtime。
+2. 启用 sourceConnector 并检查 `source-config.yml`（与 sink-config.yml 基本相同）。
3. 启动你的 RabbitMQConnectorServer，它将订阅到 RabbitMQ 中的
`connectorConfig.queueName`，并将数据发送到 EventMesh Runtime 中的 `pubSubConfig.subject`。
4. 向队列发送一个 CloudEvent 消息，然后你将在 EventMesh 中接收到该消息。
\ No newline at end of file
diff --git a/eventmesh-connectors/eventmesh-connector-redis/README_CN.md
b/eventmesh-connectors/eventmesh-connector-redis/README_CN.md
index 7b8458468..cf56c33b6 100644
--- a/eventmesh-connectors/eventmesh-connector-redis/README_CN.md
+++ b/eventmesh-connectors/eventmesh-connector-redis/README_CN.md
@@ -21,7 +21,7 @@ pubSubConfig:
connectorConfig:
connectorName: redisSink
server: redis://127.0.0.1:6379
- # redis 中的主题
+ # Redis 中的主题
topic: SinkTopic
```
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
index e86cda550..f64eeeded 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/http/push/AsyncHTTPPushRequest.java
@@ -217,8 +217,7 @@ public class AsyncHTTPPushRequest extends
AbstractHTTPPushRequest {
.get(handleMsgContext.getTopic()).getHttpAuthTypeMap().get(currPushUrl);
WebhookUtil.setWebhookHeaders(builder,
httpEntity.getContentType().getValue(),
- eventMeshHttpConfiguration.getEventMeshWebhookOrigin(),
- urlAuthType);
+ eventMeshHttpConfiguration.getEventMeshWebhookOrigin(),
urlAuthType);
eventMeshHTTPServer.getMetrics().getSummaryMetrics().recordPushMsg();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
