bugfix: 依赖的其他系统（CMDB、IAM等）接口异常时报错信息优化 TencentBlueKing#1430

liuliaozhong · Feb 1, 2023 · 6644ea9 · 6644ea9
1 parent 6455a73
commit 6644ea9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 37 deletions.
diff --git a/...commons/common/src/main/java/com/tencent/bk/job/common/exception/CmdbClientException.java b/...commons/common/src/main/java/com/tencent/bk/job/common/exception/CmdbClientException.java
diff --git a/...nage/src/main/java/com/tencent/bk/job/manage/dao/notify/impl/NotifyEsbChannelDAOImpl.java b/...nage/src/main/java/com/tencent/bk/job/manage/dao/notify/impl/NotifyEsbChannelDAOImpl.java
@@ -30,7 +30,6 @@
 import com.google.common.util.concurrent.UncheckedExecutionException;
 import com.tencent.bk.job.common.constant.ErrorCode;
 import com.tencent.bk.job.common.exception.InternalCmsiException;
-import com.tencent.bk.job.common.exception.InternalException;
 import com.tencent.bk.job.common.util.JobContextUtil;
 import com.tencent.bk.job.manage.dao.notify.NotifyEsbChannelDAO;
 import com.tencent.bk.job.manage.model.dto.notify.NotifyEsbChannelDTO;
@@ -98,12 +97,7 @@ public List<NotifyEsbChannelDTO> listNotifyEsbChannel(DSLContext dslContext) {
         } catch (ExecutionException | UncheckedExecutionException e) {
             String errorMsg = "Fail to load EsbChannel from cache";
             logger.error(errorMsg, e);
-            Throwable cause = e.getCause();
-            if (cause instanceof RuntimeException) {
-                throw (RuntimeException) cause;
-            } else {
-                throw new InternalCmsiException(errorMsg, e, ErrorCode.CMSI_MSG_CHANNEL_DATA_ERROR);
-            }
+            throw new InternalCmsiException(errorMsg, e, ErrorCode.CMSI_MSG_CHANNEL_DATA_ERROR);
         }
     }
 }