cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v2.0.5_dev' into v2.0.5_dev

This commit is contained in:
HuangXin 2021-01-19 15:40:21 +08:00
parent 7e3087f397 437084ffd7
commit 528ef2249a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/dispose/ability/impl/DpTechBypassAbilityImpl.java
View File

@ -245,7 +245,7 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
log.debug("++++Begging Create Traction Strategy: {}, {}", objName, disposeObject); log.debug("++++Begging Create Traction Strategy: {}, {}", objName, disposeObject);
// 获取旁路手动牵引策略名 // 获取旁路手动牵引策略名
String tractionName = getTractionStrategyName(objName, disposeObject); String tractionName = getTractionStrategyName(disposeObject);
// 删除旧的策略 // 删除旧的策略
err = removeTractionStrategy(tractionName); err = removeTractionStrategy(tractionName);
@ -282,7 +282,7 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
log.debug("++++Begging Start Traction Strategy: {}, {}", objName, disposeObject); log.debug("++++Begging Start Traction Strategy: {}, {}", objName, disposeObject);
// 获取旁路手动牵引策略名 // 获取旁路手动牵引策略名
String policyName = getTractionStrategyName(objName, disposeObject); String policyName = getTractionStrategyName(disposeObject);
// 启动旁路手动牵引策略 // 启动旁路手动牵引策略
log.debug("DpTech startBypassManualTractionStrategyForUMC request: {}, {}", policyName, disposeObject); log.debug("DpTech startBypassManualTractionStrategyForUMC request: {}, {}", policyName, disposeObject);
@ -313,7 +313,7 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
log.debug("++++Begging Stop Traction Strategy: {}, {}", objName, disposeObject); log.debug("++++Begging Stop Traction Strategy: {}, {}", objName, disposeObject);
// 获取旁路手动牵引策略名 // 获取旁路手动牵引策略名
String policyName = getTractionStrategyName(objName, disposeObject); String policyName = getTractionStrategyName(disposeObject);
// 判断缓存中是否有该防护策略 // 判断缓存中是否有该防护策略
if (!dpBypassManager.getTractionStrategyName().containsKey(policyName)) { if (!dpBypassManager.getTractionStrategyName().containsKey(policyName)) {
@ -560,12 +560,11 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
/** /**
* Gets traction strategy name. * Gets traction strategy name.
* *
* @param objName the obj name
* @param disposeIp the dispose ip * @param disposeIp the dispose ip
* @return the traction strategy name * @return the traction strategy name
*/ */
private String getTractionStrategyName(String objName, String disposeIp) { private String getTractionStrategyName(String disposeIp) {
return objectPrefix + "_" + disposeIp + "_" + objName; return objectPrefix + "_" + disposeIp;
} }
/** /**
@ -919,7 +918,7 @@ public class DpTechBypassAbilityImpl extends DpTechAbilityImpl {
return new MulReturnType<>(err, null); return new MulReturnType<>(err, null);
} }
err = removeTractionStrategy(getTractionStrategyName(protectObjName, disposeObject)); err = removeTractionStrategy(getTractionStrategyName(disposeObject));
if (err != ErrorCode.ERR_OK) { if (err != ErrorCode.ERR_OK) {
log.error("----Error DPTech Stop Cleanup Task, Clean Traction Strategy Error: {}, {}", log.error("----Error DPTech Stop Cleanup Task, Clean Traction Strategy Error: {}, {}",