midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'origin/release-7.1'

This commit is contained in:
hengsin 2020-04-02 10:01:29 +08:00
parent e10a5c9425 99cead1540
commit ee4ec74a88
5 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
org.adempiere.ui.zk/WEB-INF/src/fi/jawsy/jawwa/zk/atmosphere/AtmosphereServerPush.java
View File

@ -29,6 +29,7 @@ import org.atmosphere.cpr.AtmosphereResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.zkoss.lang.Library;
import org.zkoss.zk.au.out.AuEcho;
import org.zkoss.zk.au.out.AuScript;
import org.zkoss.zk.ui.Desktop;
import org.zkoss.zk.ui.DesktopUnavailableException;
@ -62,6 +63,7 @@ public class AtmosphereServerPush implements ServerPush {
private ExecutionCarryOver _carryOver;
private final Object _mutex = new Object();
private List<Schedule<Event>> schedules = new ArrayList<>();
private long lastPiggyBack = 0;
public AtmosphereServerPush() {
String timeoutString = Library.getProperty("fi.jawsy.jawwa.zk.atmosphere.timeout");
@ -162,6 +164,7 @@ public class AtmosphereServerPush implements ServerPush {
@SuppressWarnings("unchecked")
@Override
public void onPiggyback() {
lastPiggyBack = System.currentTimeMillis();
Schedule<Event>[] pendings = null;
synchronized (schedules) {
if (!schedules.isEmpty()) {
@ -171,6 +174,7 @@ public class AtmosphereServerPush implements ServerPush {
}
if (pendings != null && pendings.length > 0) {
for(Schedule<Event> p : pendings) {
//schedule and execute in desktop's onPiggyBack listener
p.scheduler.schedule(p.task, p.event);
}
}
@ -180,53 +184,54 @@ public class AtmosphereServerPush implements ServerPush {
@Override
public <T extends Event> void schedule(EventListener<T> task, T event,
Scheduler<T> scheduler) {
if (Executions.getCurrent() == null) {
//save for schedule at on piggyback event
synchronized (schedules) {
schedules.add(new Schedule(task, event, scheduler));
}
boolean ok = false;
//schedule and execute in desktop's onPiggyBack listener
scheduler.schedule(task, event);
boolean ok = false;
try {
ok = commitResponse();
} catch (IOException e) {
log.error(e.getMessage(), e);
}
if (!ok) {
long l = lastPiggyBack;
for(int i = 0; i < 3 && !ok; i++) {
try {
Thread.sleep(100);
} catch (InterruptedException e1) {}
if (schedules.size() > 0) {
if (l == lastPiggyBack) {
try {
ok = commitResponse();
} catch (IOException e) {
log.error(e.getMessage(), e);
}
} else {
ok = true;
}
} else {
ok = true;
}
}
if (!ok) {
Desktop d = desktop.get();
log.warn("Failed to resume long polling resource" + (d != null ? " for desktop " + d.getId() : ""));
if (d != null) {
Integer count = (Integer) d.getAttribute(AdempiereWebUI.SERVERPUSH_SCHEDULE_FAILURES);
if (count != null)
count = Integer.valueOf(count.intValue()+1);
else
count = Integer.valueOf(1);
d.setAttribute(AdempiereWebUI.SERVERPUSH_SCHEDULE_FAILURES, count);
AdempiereWebUI.increaseScheduleFailures(d);
}
}
}
} else {
//in event listener thread, can schedule immediately
scheduler.schedule(task, event);
// in event listener thread, use echo to execute async
synchronized (schedules) {
schedules.add(new Schedule(task, event, scheduler));
}
if (Executions.getCurrent().getAttribute("AtmosphereServerPush.Echo") == null) {
Executions.getCurrent().setAttribute("AtmosphereServerPush.Echo", Boolean.TRUE);
Clients.response(new AuEcho());
}
}
}
@Override
@Override
public void start(Desktop desktop) {
Desktop oldDesktop = this.desktop.getAndSet(desktop);
if (oldDesktop != null) {

27
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/AdempiereWebUI.java
View File

@ -594,4 +594,31 @@ public class AdempiereWebUI extends Window implements EventListener<Event>, IWeb
}
return uploadSetting.toString();
}
/**
* Increase server push schedule failures count
* @param d
*/
public static void increaseScheduleFailures(Desktop d) {
Integer count = (Integer) d.getAttribute(SERVERPUSH_SCHEDULE_FAILURES);
if (count != null)
count = Integer.valueOf(count.intValue()+1);
else
count = Integer.valueOf(1);
d.setAttribute(SERVERPUSH_SCHEDULE_FAILURES, count);
}
/**
*
* @param d
* @return server push schedule failures count
*/
public static int getScheduleFailures(Desktop d) {
int failures = 0;
Object attr = d.getAttribute(AdempiereWebUI.SERVERPUSH_SCHEDULE_FAILURES);
if (attr != null && attr instanceof Integer)
failures = ((Integer)attr).intValue();
return failures;
}
}

34
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DefaultDesktop.java
View File

@ -31,13 +31,11 @@ import org.adempiere.base.event.EventManager;
import org.adempiere.base.event.IEventManager;
import org.adempiere.base.event.IEventTopics;
import org.adempiere.model.MBroadcastMessage;
import org.adempiere.util.ServerContext;
import org.adempiere.webui.ClientInfo;
import org.adempiere.webui.LayoutUtils;
import org.adempiere.webui.adwindow.ADWindow;
import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.apps.BusyDialog;
import org.adempiere.webui.apps.DesktopRunnable;
import org.adempiere.webui.apps.ProcessDialog;
import org.adempiere.webui.apps.WReport;
import org.adempiere.webui.component.Tab;
@ -54,15 +52,11 @@ import org.adempiere.webui.panel.BroadcastMessageWindow;
import org.adempiere.webui.panel.HeaderPanel;
import org.adempiere.webui.panel.HelpController;
import org.adempiere.webui.panel.TimeoutPanel;
import org.adempiere.webui.session.SessionContextListener;
import org.adempiere.webui.session.SessionManager;
import org.adempiere.webui.theme.ThemeManager;
import org.adempiere.webui.util.IServerPushCallback;
import org.adempiere.webui.util.ServerPushTemplate;
import org.adempiere.webui.util.UserPreference;
import org.adempiere.webui.util.ZKUpdateUtil;
import org.adempiere.webui.window.FDialog;
import org.compiere.Adempiere;
import org.compiere.model.GridField;
import org.compiere.model.GridTab;
import org.compiere.model.I_AD_Preference;
@ -382,30 +376,10 @@ public class DefaultDesktop extends TabbedDesktop implements MenuListener, Seria
layout.getDesktop().enableServerPush(true);
}
Runnable runnable = new Runnable() {
public void run() {
try {
Thread.sleep(100);
} catch (InterruptedException e) {}
IServerPushCallback callback = new IServerPushCallback() {
public void updateUI() {
Properties ctx = (Properties)layout.getDesktop().getSession().getAttribute(SessionContextListener.SESSION_CTX);
try {
ServerContext.setCurrentInstance(ctx);
renderHomeTab();
automaticOpen(ctx);
} finally {
ServerContext.dispose();
}
}
};
ServerPushTemplate template = new ServerPushTemplate(layout.getDesktop());
template.executeAsync(callback);
}
};
Adempiere.getThreadPoolExecutor().submit(new DesktopRunnable(runnable,layout.getDesktop()));
Executions.schedule(layout.getDesktop(), event -> {
renderHomeTab();
automaticOpen(Env.getCtx());
}, new Event("onRenderHomeTab"));
ToolBar toolbar = windowContainer.getToobar();

14
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/editor/WTableDirEditor.java
View File

@ -918,11 +918,8 @@ ContextMenuListener, IZoomableEditor
}
private void refreshLookupList() {
int failures = 0;
Desktop desktop = editor.getComponent().getDesktop();
Object attr = desktop.getAttribute(AdempiereWebUI.SERVERPUSH_SCHEDULE_FAILURES);
if (attr != null && attr instanceof Integer)
failures = ((Integer)attr).intValue();
int failures = AdempiereWebUI.getScheduleFailures(desktop);
Executions.schedule(desktop, new EventListener<Event>() {
@Override
public void onEvent(Event event) {
@ -932,12 +929,9 @@ ContextMenuListener, IZoomableEditor
} catch (Exception e) {}
}
}, new Event("onResetLookupList"));
attr = desktop.getAttribute(AdempiereWebUI.SERVERPUSH_SCHEDULE_FAILURES);
if (attr != null && attr instanceof Integer) {
int f = ((Integer)attr).intValue();
if (f > failures) {
((ITableDirEditor)editor.getComponent()).cleanup();
}
int f = AdempiereWebUI.getScheduleFailures(desktop);
if (f > failures) {
((ITableDirEditor)editor.getComponent()).cleanup();
}
}

26
org.adempiere.ui.zk/WEB-INF/src/org/idempiere/ui/zk/websocket/WebSocketServerPush.java
View File

@ -33,6 +33,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.adempiere.webui.AdempiereWebUI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.zkoss.zk.au.out.AuEcho;
import org.zkoss.zk.au.out.AuScript;
import org.zkoss.zk.ui.Desktop;
import org.zkoss.zk.ui.DesktopUnavailableException;
@ -177,6 +178,7 @@ public class WebSocketServerPush implements ServerPush {
}
if (pendings != null && pendings.length > 0) {
for(Schedule<Event> p : pendings) {
//schedule and execute in desktop's onPiggyBack listener
p.scheduler.schedule(p.task, p.event);
}
}
@ -199,25 +201,25 @@ public class WebSocketServerPush implements ServerPush {
public <T extends Event> void schedule(EventListener<T> task, T event,
Scheduler<T> scheduler) {
if (Executions.getCurrent() == null) {
//save for schedule at on piggyback event
synchronized (schedules) {
schedules.add(new Schedule(task, event, scheduler));
}
//schedule and execute in desktop's onPiggyBack listener
scheduler.schedule(task, event);
boolean ok = echo();
if (!ok) {
Desktop d = desktop.get();
log.warn("Failed to resume long polling resource" + (d != null ? " for desktop " + d.getId() : ""));
if (d != null) {
Integer count = (Integer) d.getAttribute(AdempiereWebUI.SERVERPUSH_SCHEDULE_FAILURES);
if (count != null)
count = Integer.valueOf(count.intValue()+1);
else
count = Integer.valueOf(1);
d.setAttribute(AdempiereWebUI.SERVERPUSH_SCHEDULE_FAILURES, count);
AdempiereWebUI.increaseScheduleFailures(d);
}
}
} else {
//in event listener thread, can schedule immediately
scheduler.schedule(task, event);
// in event listener thread, use echo to execute async
synchronized (schedules) {
schedules.add(new Schedule(task, event, scheduler));
}
if (Executions.getCurrent().getAttribute("AtmosphereServerPush.Echo") == null) {
Executions.getCurrent().setAttribute("AtmosphereServerPush.Echo", Boolean.TRUE);
Clients.response(new AuEcho());
}
}
}