You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by jo...@apache.org on 2020/02/25 06:19:35 UTC
[incubator-dolphinscheduler] branch dev updated: remove
String.format for org.slf4j.Logger (#2001)
This is an automated email from the ASF dual-hosted git repository.
journey pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 5ca4862 remove String.format for org.slf4j.Logger (#2001)
5ca4862 is described below
commit 5ca4862ea97a98052a4591719ae622f553a3a893
Author: gabry.wu <wu...@qq.com>
AuthorDate: Tue Feb 25 14:19:26 2020 +0800
remove String.format for org.slf4j.Logger (#2001)
---
.../apache/dolphinscheduler/api/service/ExecutorService.java | 2 +-
.../dolphinscheduler/api/service/ResourcesService.java | 2 +-
.../apache/dolphinscheduler/common/utils/ParameterUtils.java | 2 +-
.../common/utils/placeholder/PlaceholderUtils.java | 2 +-
.../common/utils/placeholder/TimePlaceholderUtils.java | 2 +-
.../common/threadutils/ThreadPoolExecutorsTest.java | 2 +-
.../server/master/runner/MasterSchedulerThread.java | 2 +-
.../server/worker/task/AbstractCommandExecutor.java | 6 +++---
.../dolphinscheduler/service/process/ProcessService.java | 12 ++++++------
.../dolphinscheduler/service/quartz/QuartzExecutors.java | 4 ++--
.../dolphinscheduler/service/queue/TaskQueueZkImpl.java | 4 ++--
11 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 0389890..152292a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -242,7 +242,7 @@ public class ExecutorService extends BaseService{
}
break;
default:
- logger.error(String.format("unknown execute type : %s", executeType.toString()));
+ logger.error("unknown execute type : {}", executeType);
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "unknown execute type");
break;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java
index 6438e20..c1adb88 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java
@@ -547,7 +547,7 @@ public class ResourcesService extends BaseService {
}
} catch (Exception e) {
- logger.error(String.format("Resource %s read failed", hdfsFileName), e);
+ logger.error("Resource {} read failed", hdfsFileName, e);
putMsg(result, Status.HDFS_OPERATION_ERROR);
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
index a6dd53e..7f28883 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
@@ -61,7 +61,7 @@ public class ParameterUtils {
try {
cronTime = DateUtils.parseDate(cronTimeStr, new String[]{Constants.PARAMETER_FORMAT_TIME});
} catch (ParseException e) {
- logger.error(String.format("parse %s exception", cronTimeStr), e);
+ logger.error("parse {} exception", cronTimeStr, e);
}
} else {
cronTime = new Date();
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PlaceholderUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PlaceholderUtils.java
index b52707b..0c756cb 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PlaceholderUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/PlaceholderUtils.java
@@ -90,7 +90,7 @@ public class PlaceholderUtils {
try {
return paramsMap.get(placeholderName);
} catch (Exception ex) {
- logger.error(String.format("resolve placeholder '%s' in [ %s ]" , placeholderName, value), ex);
+ logger.error("resolve placeholder '{}' in [ {} ]" , placeholderName, value, ex);
return null;
}
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtils.java
index 1751df5..15e3282 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtils.java
@@ -278,7 +278,7 @@ public class TimePlaceholderUtils {
try {
return calculateTime(placeholderName, date);
} catch (Exception ex) {
- logger.error(String.format("resolve placeholder '%s' in [ %s ]" , placeholderName, value), ex);
+ logger.error("resolve placeholder '{}' in [ {} ]" , placeholderName, value, ex);
return null;
}
}
diff --git a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadPoolExecutorsTest.java b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadPoolExecutorsTest.java
index 265f7ea..9879154 100644
--- a/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadPoolExecutorsTest.java
+++ b/dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadPoolExecutorsTest.java
@@ -48,7 +48,7 @@ public class ThreadPoolExecutorsTest {
class Thread2 extends Thread {
@Override
public void run() {
- logger.info(String.format("ThreadPoolExecutors instance's hashcode is: %s ",ThreadPoolExecutors.getInstance("a",2).hashCode()));
+ logger.info("ThreadPoolExecutors instance's hashcode is: {} ",ThreadPoolExecutors.getInstance("a",2).hashCode());
}
}
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java
index c0ddb1c..cc5a7e7 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerThread.java
@@ -117,7 +117,7 @@ public class MasterSchedulerThread implements Runnable {
// make sure to scan and delete command table in one transaction
Command command = processService.findOneCommand();
if (command != null) {
- logger.info(String.format("find one command: id: %d, type: %s", command.getId(),command.getCommandType().toString()));
+ logger.info("find one command: id: {}, type: {}", command.getId(),command.getCommandType());
try{
processInstance = processService.handleCommand(logger, OSUtils.getHost(), this.masterExecThreadNum - activeCount, command);
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
index c473f3a..bac498c 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
@@ -176,7 +176,7 @@ public abstract class AbstractCommandExecutor {
} catch (InterruptedException e) {
exitStatusCode = -1;
- logger.error(String.format("interrupt exception: {}, task may be cancelled or killed",e.getMessage()), e);
+ logger.error("interrupt exception: {}, task may be cancelled or killed", e.getMessage(), e);
throw new RuntimeException("interrupt exception. exitCode is : " + exitStatusCode);
} catch (Exception e) {
exitStatusCode = -1;
@@ -408,7 +408,7 @@ public abstract class AbstractCommandExecutor {
}
}
} catch (Exception e) {
- logger.error(String.format("yarn applications: %s status failed ", appIds.toString()),e);
+ logger.error("yarn applications: {} status failed ", appIds,e);
result = false;
}
return result;
@@ -458,7 +458,7 @@ public abstract class AbstractCommandExecutor {
lineList.add(line);
}
} catch (Exception e) {
- logger.error(String.format("read file: %s failed : ",filename),e);
+ logger.error("read file: {} failed",filename,e);
} finally {
if(br != null){
try {
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 34b1e48..b589cd4 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -477,7 +477,7 @@ public class ProcessService {
if(cmdParam == null
|| !cmdParam.containsKey(Constants.CMDPARAM_START_NODE_NAMES)
|| cmdParam.get(Constants.CMDPARAM_START_NODE_NAMES).isEmpty()){
- logger.error(String.format("command node depend type is %s, but start nodes is null ", command.getTaskDependType().toString()));
+ logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
return false;
}
}
@@ -500,7 +500,7 @@ public class ProcessService {
if(command.getProcessDefinitionId() != 0){
processDefinition = processDefineMapper.selectById(command.getProcessDefinitionId());
if(processDefinition == null){
- logger.error(String.format("cannot find the work process define! define id : %d", command.getProcessDefinitionId()));
+ logger.error("cannot find the work process define! define id : {}", command.getProcessDefinitionId());
return null;
}
}
@@ -973,21 +973,21 @@ public class ProcessService {
return true;
}
if(taskInstance.getState().typeIsFinished()){
- logger.info(String.format("submit to task queue, but task [%s] state [%s] is already finished. ", taskInstance.getName(), taskInstance.getState().toString()));
+ logger.info("submit to task queue, but task [{}] state [{}] is already finished. ", taskInstance.getName(), taskInstance.getState());
return true;
}
// task cannot submit when running
if(taskInstance.getState() == ExecutionStatus.RUNNING_EXEUTION){
- logger.info(String.format("submit to task queue, but task [%s] state already be running. ", taskInstance.getName()));
+ logger.info("submit to task queue, but task [{}] state already be running. ", taskInstance.getName());
return true;
}
if(checkTaskExistsInTaskQueue(taskInstance)){
- logger.info(String.format("submit to task queue, but task [%s] already exists in the queue.", taskInstance.getName()));
+ logger.info("submit to task queue, but task [{}] already exists in the queue.", taskInstance.getName());
return true;
}
logger.info("task ready to queue: {}" , taskInstance);
boolean insertQueueResult = taskQueue.add(DOLPHINSCHEDULER_TASKS_QUEUE, taskZkInfo(taskInstance));
- logger.info(String.format("master insert into queue success, task : %s", taskInstance.getName()) );
+ logger.info("master insert into queue success, task : {}", taskInstance.getName());
return insertQueueResult;
}catch (Exception e){
logger.error("submit task to queue Exception: ", e);
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java
index 9d96264..60cdb1d 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/QuartzExecutors.java
@@ -223,7 +223,7 @@ public class QuartzExecutors {
}
} catch (SchedulerException e) {
- logger.error(String.format("delete job : %s failed",jobName), e);
+ logger.error("delete job : {} failed",jobName, e);
} finally {
lock.writeLock().unlock();
}
@@ -247,7 +247,7 @@ public class QuartzExecutors {
return scheduler.deleteJobs(jobKeys);
} catch (SchedulerException e) {
- logger.error(String.format("delete all jobs in job group: %s failed",jobGroupName), e);
+ logger.error("delete all jobs in job group: {} failed",jobGroupName, e);
} finally {
lock.writeLock().unlock();
}
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskQueueZkImpl.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskQueueZkImpl.java
index 874512c..9c1d318 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskQueueZkImpl.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/TaskQueueZkImpl.java
@@ -269,7 +269,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
zookeeperOperator.remove(taskIdPath);
}catch(Exception e){
- logger.error(String.format("delete task:%s from zookeeper fail, exception:" ,nodeValue) ,e);
+ logger.error("delete task:{} from zookeeper fail, exception:" ,nodeValue ,e);
}
}
@@ -318,7 +318,7 @@ public class TaskQueueZkImpl implements ITaskQueue {
zookeeperOperator.remove(path + value);
}catch(Exception e){
- logger.error(String.format("delete task:" + value + " exception"),e);
+ logger.error("delete task:{} exception",value,e);
}
}