增加构建通知
This commit is contained in:
parent
1590760616
commit
a872e8d290
@ -99,9 +99,6 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
|
|||||||
@Resource
|
@Resource
|
||||||
private INotificationSendService notificationSendService;
|
private INotificationSendService notificationSendService;
|
||||||
|
|
||||||
@Resource
|
|
||||||
private jakarta.persistence.EntityManager entityManager;
|
|
||||||
|
|
||||||
@Resource(name = "jenkinsTaskExecutor")
|
@Resource(name = "jenkinsTaskExecutor")
|
||||||
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
|
private ThreadPoolTaskExecutor threadPoolTaskExecutor;
|
||||||
|
|
||||||
@ -112,7 +109,6 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
|
|||||||
doSyncBuilds(externalSystemId, null, null);
|
doSyncBuilds(externalSystemId, null, null);
|
||||||
|
|
||||||
// 同步完成后检查并发送构建通知
|
// 同步完成后检查并发送构建通知
|
||||||
// 注意:checkBuildNotifications 内部会处理异常,不会影响同步事务
|
|
||||||
checkBuildNotifications(externalSystemId);
|
checkBuildNotifications(externalSystemId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -653,14 +649,10 @@ public class JenkinsBuildServiceImpl extends BaseServiceImpl<JenkinsBuild, Jenki
|
|||||||
}
|
}
|
||||||
|
|
||||||
} catch (org.springframework.orm.ObjectOptimisticLockingFailureException e) {
|
} catch (org.springframework.orm.ObjectOptimisticLockingFailureException e) {
|
||||||
// 乐观锁冲突,说明记录已被其他线程更新
|
// 乐观锁冲突,说明记录已被其他线程更新,跳过即可
|
||||||
// 清除持久化上下文,避免脏数据影响后续操作
|
|
||||||
entityManager.clear();
|
|
||||||
log.warn("构建通知记录乐观锁冲突,跳过处理: teamId={}, envId={}, buildId={}",
|
log.warn("构建通知记录乐观锁冲突,跳过处理: teamId={}, envId={}, buildId={}",
|
||||||
config.getTeamId(), config.getEnvironmentId(), build.getId());
|
config.getTeamId(), config.getEnvironmentId(), build.getId());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// 清除持久化上下文,避免脏数据影响后续操作
|
|
||||||
entityManager.clear();
|
|
||||||
log.error("处理构建通知失败: teamId={}, envId={}, buildId={}",
|
log.error("处理构建通知失败: teamId={}, envId={}, buildId={}",
|
||||||
config.getTeamId(), config.getEnvironmentId(), build.getId(), e);
|
config.getTeamId(), config.getEnvironmentId(), build.getId(), e);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user