Browse Source

Pull request #2280: REPORT-39343 【回归】设计器切换远程时卡死 死锁了

Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'f3309d289768eab3d803035d91c578305ee85495':
  REPORT-39343 【回归】设计器切换远程时卡死 死锁了
feature/big-screen
Hades 4 years ago
parent
commit
7c5e5b8715
  1. 5
      designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java

5
designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java

@ -4,6 +4,7 @@ import com.fr.base.io.IOFile;
import com.fr.base.io.XMLReadHelper;
import com.fr.config.MarketConfig;
import com.fr.design.DesignerEnvManager;
import com.fr.design.i18n.Toolkit;
import com.fr.web.session.SessionLocalManager;
import com.fr.stable.StableUtils;
@ -31,6 +32,7 @@ public class ErrorInfoLogAppender extends AppenderSkeleton {
private static final int ERROR_LEN = 8;
private static final int ERROR_STACK_TRACE = 15;
private static final String ERROR_CODE = Toolkit.i18nText("Fine-Design_Report_Engine_ErrorCode_Prefix") + ".*?[:,:]";
// 缓存下不变的, 没必要频繁取.
private String username;
@ -92,9 +94,8 @@ public class ErrorInfoLogAppender extends AppenderSkeleton {
}
private String readLogID(String log) {
String errorCode = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_ErrorCode_Prefix");
// 报错信息国际化不规范, 有些是中文分号, 有些是英文
String[] matchs = log.split(errorCode + ".*?[:,:]");
String[] matchs = log.split(ERROR_CODE);
if (matchs.length <= 1) {
return StringUtils.EMPTY;
}

Loading…
Cancel
Save