Skip to content

Commit

Permalink
Merge pull request apache#5037 from WeDataSphere/master-remove-log
Browse files Browse the repository at this point in the history
[Bug] Remove unnecessary log print
  • Loading branch information
ChengJie1053 authored Dec 13, 2023
2 parents 7766933 + 08cbcfc commit f811794
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion linkis-dist/deploy-config/linkis-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,10 @@ public MetadataConnection<SqlConnection> 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));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit f811794

Please sign in to comment.