You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2022/04/12 07:06:34 UTC

[ranger] branch ranger-2.3 updated: RANGER-3704: remove semicolon from c3P0 preferredTestQuery

This is an automated email from the ASF dual-hosted git repository.

pradeep pushed a commit to branch ranger-2.3
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.3 by this push:
     new 361f17924 RANGER-3704: remove semicolon from c3P0 preferredTestQuery
361f17924 is described below

commit 361f179249679bb7a78d2ca10aa5bccca79088ee
Author: pradeep <pr...@apache.org>
AuthorDate: Mon Apr 11 18:26:35 2022 +0530

    RANGER-3704: remove semicolon from c3P0 preferredTestQuery
---
 security-admin/scripts/setup.sh                                | 10 +++++-----
 .../src/main/resources/conf.dist/ranger-admin-default-site.xml |  2 +-
 security-admin/src/main/webapp/WEB-INF/logback.xml             |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/security-admin/scripts/setup.sh b/security-admin/scripts/setup.sh
index e8b94f0d6..4ca4e9d82 100755
--- a/security-admin/scripts/setup.sh
+++ b/security-admin/scripts/setup.sh
@@ -641,7 +641,7 @@ update_properties() {
 		updatePropertyToFilePy $propertyName $newPropertyValue $to_file_default
 
 		propertyName=ranger.jpa.jdbc.preferredtestquery
-		newPropertyValue="select 1;"
+		newPropertyValue="select 1"
 		updatePropertyToFilePy $propertyName "${newPropertyValue}" $to_file_default
 	fi
 	if [ "${DB_FLAVOR}" == "ORACLE" ]
@@ -675,7 +675,7 @@ update_properties() {
 		updatePropertyToFilePy $propertyName $newPropertyValue $to_file_default
 
 		propertyName=ranger.jpa.jdbc.preferredtestquery
-		newPropertyValue="select 1 from dual;"
+		newPropertyValue="select 1 from dual"
 		updatePropertyToFilePy $propertyName "${newPropertyValue}" $to_file_default
 	fi
 	if [ "${DB_FLAVOR}" == "POSTGRES" ]
@@ -715,7 +715,7 @@ update_properties() {
 		updatePropertyToFilePy $propertyName $newPropertyValue $to_file_default
 
 		propertyName=ranger.jpa.jdbc.preferredtestquery
-		newPropertyValue="select 1;"
+		newPropertyValue="select 1"
 		updatePropertyToFilePy $propertyName "${newPropertyValue}" $to_file_default
 	fi
 
@@ -742,7 +742,7 @@ update_properties() {
 		updatePropertyToFilePy $propertyName $newPropertyValue $to_file_default
 
 		propertyName=ranger.jpa.jdbc.preferredtestquery
-		newPropertyValue="select 1;"
+		newPropertyValue="select 1"
 		updatePropertyToFilePy $propertyName "${newPropertyValue}" $to_file_default
 	fi
 
@@ -769,7 +769,7 @@ update_properties() {
 		updatePropertyToFilePy $propertyName $newPropertyValue $to_file_default
 
 		propertyName=ranger.jpa.jdbc.preferredtestquery
-		newPropertyValue="select 1;"
+		newPropertyValue="select 1"
 		updatePropertyToFilePy $propertyName "${newPropertyValue}" $to_file_default
 	fi
 
diff --git a/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml b/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml
index ebc00628c..f95b802fb 100644
--- a/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml
+++ b/security-admin/src/main/resources/conf.dist/ranger-admin-default-site.xml
@@ -375,7 +375,7 @@
 
 	<property>
 		<name>ranger.jpa.jdbc.preferredtestquery</name>
-		<value>select 1;</value>
+		<value>select 1</value>
 		<description></description>
 	</property>
 
diff --git a/security-admin/src/main/webapp/WEB-INF/logback.xml b/security-admin/src/main/webapp/WEB-INF/logback.xml
index 997f3bc59..53cdc49cf 100644
--- a/security-admin/src/main/webapp/WEB-INF/logback.xml
+++ b/security-admin/src/main/webapp/WEB-INF/logback.xml
@@ -80,7 +80,7 @@
   <logger name="xa" additivity="false" level="info">
     <appender-ref ref="xa_log_appender"/>
   </logger>
-  <logger name="jdbc.connection" additivity="false" level="error">
+  <logger name="com.mchange" additivity="false" level="error">
     <appender-ref ref="sql_appender"/>
   </logger>
   <logger name="org.apache.ranger.perf" additivity="false" level="info">