Browse Source

Merge pull request #1545 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'ba343eb2b487f9c3c278fffd5c8efb35b0f4cb00':
  REPORT-29003 错误报告问题
feature/big-screen
Hades 5 years ago
parent
commit
9ecbf7576c
  1. 4
      designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java
  2. 4
      designer-realize/src/main/java/com/fr/start/DesignerSuperListener.java

4
designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java vendored

@ -23,6 +23,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
/**
* 根据配置生成运行环境
@ -55,7 +56,7 @@ public class DesignerWorkspaceGenerator {
WorkspaceClient client = null;
try {
client = future.get(WAIT_FREQ, TimeUnit.SECONDS);
} catch (Exception e) {
} catch (TimeoutException e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
RemoteHandler.handle(config);
}
@ -92,7 +93,6 @@ public class DesignerWorkspaceGenerator {
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
} else {
}
}
}

4
designer-realize/src/main/java/com/fr/start/DesignerSuperListener.java

@ -81,6 +81,9 @@ public class DesignerSuperListener {
if (ComparatorUtils.equals(ReportState.ACTIVE.getValue(), msg)) {
startFrameListener();
}
if (ComparatorUtils.equals(DesignerProcessType.INSTANCE.obtain(), msg)) {
frameReport();
}
}
}
});
@ -90,6 +93,7 @@ public class DesignerSuperListener {
onceFuture = service.schedule(new Runnable() {
@Override
public void run() {
cancel = true;
ProcessEventPipe pipe = process.getPipe();
pipe.fire(FineProcessEngineEvent.READY);
if (StringUtils.isNotEmpty(pipe.info())) {

Loading…
Cancel
Save