From 08cbcfca140afebae10e1582ee87721578719ded Mon Sep 17 00:00:00 2001 From: peacewong Date: Wed, 13 Dec 2023 11:46:11 +0800 Subject: [PATCH] remove unnecessary log print --- .github/workflows/publish-snapshot.yml | 2 +- .../manager/am/restful/ECResourceInfoRestfulApi.java | 3 +-- .../linkis/manager/am/restful/EngineRestfulApi.java | 3 +-- linkis-dist/deploy-config/linkis-env.sh | 2 +- .../linkis/engineplugin/spark/executor/SQLSession.scala | 1 + .../restful/api/TemplateManagerRestfulApi.java | 9 +++------ .../linkis/metadata/query/service/OracleMetaService.java | 3 +-- .../linkis/metadata/query/service/MongoDbConnection.java | 6 +----- 8 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 8bb65c90f4..dfcee9e221 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: branch: - - dev-1.4.0 + - dev-1.5.0 steps: - name: Checkout repository uses: actions/checkout@v2 diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java index 0ff9ef93eb..c3c14a8094 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/ECResourceInfoRestfulApi.java @@ -237,8 +237,7 @@ public Message queryEcList(HttpServletRequest req, @RequestBody JsonNode jsonNod // check special admin token if (StringUtils.isNotBlank(token)) { if (!Configuration.isAdminToken(token)) { - logger.warn("Token:{} has no permission to query ecList.", token); - return Message.error("Token:" + token + " has no permission to query ecList."); + return Message.error("Token has no permission to query ecList."); } } else if (!Configuration.isAdmin(username)) { logger.warn("User:{} has no permission to query ecList.", username); diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java index 14cad1380e..355ce2e9c6 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/restful/EngineRestfulApi.java @@ -479,8 +479,7 @@ public Message killEngineAsyn(HttpServletRequest req, @RequestBody JsonNode json // check special token if (StringUtils.isNotBlank(token)) { if (!Configuration.isAdminToken(token)) { - logger.warn("Token {} has no permission to asyn kill engines.", token); - return Message.error("Token:" + token + " has no permission to asyn kill engines."); + return Message.error("Token has no permission to asyn kill engines."); } } else if (!Configuration.isAdmin(username)) { logger.warn("User {} has no permission to asyn kill engines.", username); diff --git a/linkis-dist/deploy-config/linkis-env.sh b/linkis-dist/deploy-config/linkis-env.sh index fed49826b5..5578e25277 100644 --- a/linkis-dist/deploy-config/linkis-env.sh +++ b/linkis-dist/deploy-config/linkis-env.sh @@ -167,7 +167,7 @@ export SERVER_HEAP_SIZE="512M" ##The extended lib such mysql-connector-java-*.jar #LINKIS_EXTENDED_LIB=/appcom/common/linkisExtendedLib -LINKIS_VERSION=1.4.0 +LINKIS_VERSION=1.5.0 # for install LINKIS_PUBLIC_MODULE=lib/linkis-commons/public-module diff --git a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala index 77fe9ca973..6e302b4402 100644 --- a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala +++ b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SQLSession.scala @@ -69,6 +69,7 @@ object SQLSession extends Logging { "Spark application sc has already stopped, please restart it." ) } + val startTime = System.currentTimeMillis() // sc.setJobGroup(jobGroup, "Get IDE-SQL Results.", false) diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java index 7ed5c4e579..e0d52d423d 100644 --- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java +++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TemplateManagerRestfulApi.java @@ -86,8 +86,7 @@ public Message updateKeyMapping(HttpServletRequest req, @RequestBody JsonNode js // check special admin token if (StringUtils.isNotBlank(token)) { if (!Configuration.isAdminToken(token)) { - logger.warn("Token:{} has no permission to updateKeyMapping.", token); - return Message.error("Token:" + token + " has no permission to updateKeyMapping."); + return Message.error("Token has no permission to updateKeyMapping."); } } else if (!Configuration.isAdmin(username)) { logger.warn("User:{} has no permission to updateKeyMapping.", username); @@ -160,8 +159,7 @@ public Message queryKeyInfoList(HttpServletRequest req, @RequestBody JsonNode js // check special admin token if (StringUtils.isNotBlank(token)) { if (!Configuration.isAdminToken(token)) { - logger.warn("Token:{} has no permission to queryKeyInfoList.", token); - return Message.error("Token:" + token + " has no permission to queryKeyInfoList."); + return Message.error("Token has no permission to queryKeyInfoList."); } } else if (!Configuration.isAdmin(username)) { logger.warn("User:{} has no permission to queryKeyInfoList.", username); @@ -212,8 +210,7 @@ public Message apply(HttpServletRequest req, @RequestBody JsonNode jsonNode) // check special admin token if (StringUtils.isNotBlank(token)) { if (!Configuration.isAdminToken(token)) { - logger.warn("Token:{} has no permission to apply.", token); - return Message.error("Token:" + token + " has no permission to apply."); + return Message.error("Token has no permission to apply."); } } else if (!Configuration.isAdmin(username)) { logger.warn("User:{} has no permission to apply.", username); diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java index 71f6595952..e048d71bda 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java +++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/OracleMetaService.java @@ -74,11 +74,10 @@ public MetadataConnection getConnection( assert extraParams != null; LOG.info("oracle connection params:{}", params.toString()); LOG.info( - "oracle connection host:{},port:{},username:{},password:{},database:{}", + "oracle connection host:{},port:{},username:{},database:{}", host, port, username, - password, database); return new MetadataConnection<>( new SqlConnection(host, port, username, password, database, serviceName, extraParams)); diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java index 7a5292852e..3586982bb5 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java +++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/service/mongodb/src/main/java/org/apache/linkis/metadata/query/service/MongoDbConnection.java @@ -177,11 +177,7 @@ public void close() throws IOException { private MongoClient getDBConnection(ConnectMessage connectMessage, String database) throws Exception { - LOG.info( - "mongo information is database:{}, username:{}, passwordd:{} ", - database, - connectMessage.username, - connectMessage.password); + LOG.info("mongo information is database:{}, username:{}", database, connectMessage.username); MongoClient client = null; try {