This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new b279bc84ac [INLONG-10122][Audit] Update the apache_inlong_audit.sql to
apache_inlong_audit_mysql.sql (#10123)
b279bc84ac is described below
commit b279bc84ac85109e7a567db5986673664c130f57
Author: Charles Zhang <[email protected]>
AuthorDate: Mon May 6 14:11:28 2024 +0800
[INLONG-10122][Audit] Update the apache_inlong_audit.sql to
apache_inlong_audit_mysql.sql (#10123)
---
bin/inlong-daemon | 2 +-
docker/docker-compose/README.md | 2 +-
inlong-audit/audit-docker/audit-docker.sh | 2 +-
inlong-distribution/src/main/assemblies/release.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/inlong-daemon b/bin/inlong-daemon
index 952a47b371..8847f34ebe 100644
--- a/bin/inlong-daemon
+++ b/bin/inlong-daemon
@@ -71,7 +71,7 @@ start_inlong_audit() {
inlong_audit_count=$(mysql --protocol=tcp -h${spring_datasource_hostname}
-P${spring_datasource_port} -u${spring_datasource_username}
-p${spring_datasource_password} -e "${select_db_sql}")
inlong_num=$(echo $inlong_audit_count | tr -cd "[0-9]")
if [ $inlong_num -eq 0 ]; then
- mysql --protocol=tcp -h${spring_datasource_hostname}
-P${spring_datasource_port} -u${spring_datasource_username}
-p${spring_datasource_password} <sql/apache_inlong_audit.sql
+ mysql --protocol=tcp -h${spring_datasource_hostname}
-P${spring_datasource_port} -u${spring_datasource_username}
-p${spring_datasource_password} <sql/apache_inlong_audit_mysql.sql
fi
echo "start audit proxy"
if [ "${mq_type}" = "pulsar" ]; then
diff --git a/docker/docker-compose/README.md b/docker/docker-compose/README.md
index eb066960d4..f7cdfa51ab 100644
--- a/docker/docker-compose/README.md
+++ b/docker/docker-compose/README.md
@@ -13,7 +13,7 @@ Manually copy SQL files from `inlong-manager/sql` and
`inlong-audit/sql` to the
```shell
cp inlong-manager/manager-web/sql/apache_inlong_manager.sql
docker/docker-compose/sql
-cp inlong-audit/sql/apache_inlong_audit.sql docker/docker-compose/sql
+cp inlong-audit/sql/apache_inlong_audit_mysql.sql docker/docker-compose/sql
```
Then, start all components.
diff --git a/inlong-audit/audit-docker/audit-docker.sh
b/inlong-audit/audit-docker/audit-docker.sh
index 777a80b801..71c71f5545 100755
--- a/inlong-audit/audit-docker/audit-docker.sh
+++ b/inlong-audit/audit-docker/audit-docker.sh
@@ -91,7 +91,7 @@ if [[ "${JDBC_URL}" =~ (.+):([0-9]+) ]]; then
inlong_audit_count=$(mysql -h${datasource_hostname} -P${datasource_port}
-u${USERNAME} -p${PASSWORD} -e "${select_db_sql}")
inlong_num=$(echo "$inlong_audit_count" | tr -cd "[0-9]")
if [ "${inlong_num}" = 0 ]; then
- mysql -h${datasource_hostname} -P${datasource_port} -u${USERNAME}
-p${PASSWORD} < sql/apache_inlong_audit.sql
+ mysql -h${datasource_hostname} -P${datasource_port} -u${USERNAME}
-p${PASSWORD} < sql/apache_inlong_audit_mysql.sql
fi
fi
diff --git a/inlong-distribution/src/main/assemblies/release.xml
b/inlong-distribution/src/main/assemblies/release.xml
index 1eb5e7970b..ab4342c8e0 100644
--- a/inlong-distribution/src/main/assemblies/release.xml
+++ b/inlong-distribution/src/main/assemblies/release.xml
@@ -175,7 +175,7 @@
<directory>../inlong-audit/audit-release/target/apache-inlong-audit-${project.version}-bin/sql</directory>
<outputDirectory>../docker/docker-compose/sql</outputDirectory>
<includes>
- <include>apache_inlong_audit.sql</include>
+ <include>apache_inlong_audit_mysql.sql</include>
</includes>
</fileSet>
<!-- package sql file for docker compose-->