Skip to content

[bugfix] fixed issue "number of placeholders in logging call doesn't mat… #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dk2k wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[bugfix] fixed issue "number of placeholders in logging call doesn't mat… #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .../com/webank/wedatasphere/dss/appconn/eventchecker/service/AbstractEventCheckReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ String setConsumedMsg(Properties props, Logger log, String[] consumedMsgInfo){
+ ", messageBody: " + vMsg);
}
}catch (Exception e) {
log.error("Error set consumed message failed {} setConsumedMsg failed" + e);
log.error("Error set consumed message failed setConsumedMsg failed ", e);
return vNewMsgID;
}
return vNewMsgID;
Expand Down Expand Up @@ -99,7 +99,7 @@ boolean updateMsgOffset(int jobId, Properties props, Logger log, String[] consum
updatePstmt.setString(4, vReceiveTime);
updatePstmt.setString(5, vNewMsgID);
int updaters = updatePstmt.executeUpdate();
log.info("updateMsgOffset successful {} update result is:" + updaters);
log.info("updateMsgOffset successful, update result is: {}", updaters);
if(updaters != 0){
log.info("Received message successfully , update message status succeeded, consumed flow execution ID: " + vProcessID);
//return true after update success
Expand Down Expand Up @@ -197,7 +197,7 @@ private String[] createExecuteType(int jobId, Properties props, Logger log,Strin
}
}
}catch(Exception e){
log.error("create executeType failed {}" + e);
log.error("create executeType failed ", e);
}
return executeType;
}
Expand Down
4 changes: 2 additions & 2 deletions ...in/java/com/webank/wedatasphere/dss/appconn/eventchecker/service/EventCheckerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public boolean sendMsg(int jobId, Properties props, Logger log) {
}
return eventCheck.sendMsg(jobId, props, log);
} else {
log.error("create EventCheckSender failed {}");
log.error("create EventCheckSender failed");
return false;
}
}
Expand All @@ -75,7 +75,7 @@ public boolean reciveMsg(int jobId, Properties props, Logger log) {
}
return eventCheck.reciveMsg(jobId, props, log);
} else {
log.error("create EventCheckSender failed {}");
log.error("create EventCheckSender failed");
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/util/HttpClientUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ public static String postJsonBody3(String url, int timeout, Map<String, Object>
//post.setEntity(new StringEntity(jsonArray.get(0).toString(), encoding));
post.setEntity(new StringEntity(null, encoding));
//logger.info("successfully start post Json Body url{},params ", url,jsonArray.get(0).toString());
logger.info("successfully start post Json Body url{},params ", url,null);
logger.info("successfully start post Json Body url {}", url);
}
CloseableHttpResponse response = httpclient.execute(post);
try {
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/webank/wedatasphere/dss/guide/server/restful/PageGuideAdminRestful.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public Message updateGuideContent(@PathVariable Long id, @RequestBody Map<String
guideContentService.updateGuideContentById(id, map);
return Message.ok("更新成功");
} catch (Exception ex) {
logger.error("ERROR", "Error found: ", ex);
logger.error("ERROR Error found: ", ex);
return Message.error(ex.getMessage());
}
}
Expand Down
4 changes: 2 additions & 2 deletions dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public static String zip(String dirPath, boolean deleteOriginDir)throws DSSError
throw new DSSErrorException(90002,errMsg.toString());
}
}catch(final Exception e){
logger.error("{} 压缩成 zip 文件失败, reason: ", e);
logger.error("压缩成 zip 文件失败, reason: ", e);
DSSErrorException exception = new DSSErrorException(90003,dirPath + " to zip file failed");
exception.initCause(e);
throw exception;
Expand Down Expand Up @@ -217,7 +217,7 @@ public static String unzip(String dirPath,boolean deleteOriginZip)throws DSSErro
file.delete();
}
}catch(final Exception e){
logger.error("{} 解压缩 zip 文件失败, reason: ", e);
logger.error("解压缩 zip 文件失败, reason: ", e);
DSSErrorException exception = new DSSErrorException(90009,dirPath + " to zip file failed");
exception.initCause(e);
throw exception;
Expand Down
6 changes: 3 additions & 3 deletions .../com/webank/wedatasphere/dss/framework/project/restful/DSSFrameworkProjectRestfulApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public Message getAllProjects(HttpServletRequest request, @RequestBody ProjectQu
try {
dssWorkspaceService.getWorkspacesById(projectRequest.getWorkspaceId(), username);
} catch (DSSErrorException e) {
LOGGER.error("User {} get workspace {} failed.", username, projectRequest.getWorkspaceId(), e);
LOGGER.error("User {} get workspace {} failed. {}", username, projectRequest.getWorkspaceId(), e);
return Message.error(e);
}
List<String> roles = dssWorkspaceRoleService.getRoleInWorkspace(username, projectRequest.getWorkspaceId().intValue());
Expand Down Expand Up @@ -486,7 +486,7 @@ public Message listAllProjectName(HttpServletRequest request, @RequestBody Proje
try {
dssWorkspaceService.getWorkspacesById(projectRequest.getWorkspaceId(), username);
} catch (DSSErrorException e) {
LOGGER.error("User {} get workspace {} failed.", username, projectRequest.getWorkspaceId(), e);
LOGGER.error("User {} get workspace {} failed. {}", username, projectRequest.getWorkspaceId(), e);
return Message.error(e);
}
List<String> roles = dssWorkspaceRoleService.getRoleInWorkspace(username, projectRequest.getWorkspaceId().intValue());
Expand Down Expand Up @@ -570,7 +570,7 @@ public Message queryAllProject(HttpServletRequest request, @RequestBody ProjectQ
try {
dssWorkspaceService.getWorkspacesById(projectRequest.getWorkspaceId(), username);
} catch (DSSErrorException e) {
LOGGER.error("User {} get workspace {} failed.", username, projectRequest.getWorkspaceId(), e);
LOGGER.error("User {} get workspace {} failed. {}", username, projectRequest.getWorkspaceId(), e);
return Message.error(e);
}
List<String> roles = dssWorkspaceRoleService.getRoleInWorkspace(username, projectRequest.getWorkspaceId().intValue());
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/webank/wedatasphere/dss/framework/workspace/restful/DSSWorkspaceRestful.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ public Message getWorkspacesById(@PathVariable("id") Long workspaceId) {
try {
workspace = dssWorkspaceService.getWorkspacesById(workspaceId, username);
} catch (DSSErrorException e) {
LOGGER.error("User {} get workspace {} failed.", username, workspaceId, e);
LOGGER.error("User {} get workspace {} failed. {}", username, workspaceId, e);
return Message.error(e);
}

Expand Down Expand Up @@ -438,7 +438,7 @@ public Message getWorkspaceAppConns(@PathVariable("workspaceId") Long workspaceI
try {
menuAppconnVos = dssWorkspaceService.getWorkspaceAppConns(workspace, workspaceId, username, isChinese);
} catch (DSSErrorException e) {
LOGGER.warn("{} get appconns from workspace {} failed.", username, workspaceId, e);
LOGGER.warn("{} get appconns from workspace {} failed. {}", username, workspaceId, e);
return Message.error(e);
}
return Message.ok().data("menus", menuAppconnVos);
Expand Down
2 changes: 1 addition & 1 deletion ...e-server/src/main/java/com/webank/wedatasphere/dss/migrate/restful/DSSMigrateRestful.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ public Message importWorkFlow(HttpServletRequest req,
String flowLatestBmlVersion = getLatestFlowBmlVersion(userName, orchestratorLatestVersion.getAppId());
responseMsg.data(FLOW_BML_VERSION_KEY, flowLatestBmlVersion);
} else {
LOG.error("Got null orchestrator version after imported. User : {}, workspace : {}, projectName : {}, projectId : {}", importOrcId, userName, workspaceName, projectName, projectVo.getId());
LOG.error("Got null orchestrator version after imported. ImportOrcId: {}, User : {}, workspace : {}, projectName : {}, projectId : {}", importOrcId, userName, workspaceName, projectName, projectVo.getId());
responseMsg.data(FLOW_ID_KEY, null);
responseMsg.data(FLOW_BML_VERSION_KEY, null);
}
Expand Down
2 changes: 1 addition & 1 deletion ...er/src/main/java/com/webank/wedatasphere/dss/migrate/service/impl/MigrateServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void migrate(String userName, String inputZipPath, Workspace workspace) t
LOG.error("fatal error, project {} 已经创建，但是创建人不是 {}", dssProject.getName(), dssProject.getCreateBy());
throw new MigrateErrorException(40035, "project has been created by others");
} else if (dbProject.getVisible() != null && dbProject.getVisible().intValue() != 1) {
LOG.error("fatal error, project {} 已经被删除 {}", dssProject.getName());
LOG.error("fatal error, project {} 已经被删除", dssProject.getName());
throw new MigrateErrorException(40036, "The project has been deleted.Please restore project before exporting");
} else {
DSSProjectVo dssProjectVo = new DSSProjectVo();
Expand Down
2 changes: 1 addition & 1 deletion ...r/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ public void updateTOSaveStatus(Long projectId, Long flowID, Long orchestratorId)
}
}
} catch (DSSErrorException e) {
logger.error("getProjectInfo failed by:", e);
logger.error("getProjectInfo failed by: ", e);
throw new DSSRuntimeException(e.getErrCode(), "更新工作流状态失败，您可以尝试重新保存工作流！原因：" + ExceptionUtils.getRootCauseMessage(e), e);
}
}
Expand Down