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

IDEMPIERE-4237 timeout page continue do comet request and log a lot message (#100) 

Revert SC_NO_Content for error bad to SC_BAD_REQUEST so that the failure
count at client side will work.
Add session timeout/notfound checking at client side.
This commit is contained in:
hengsin 2020-06-03 21:17:52 +08:00 committed by GitHub
parent 4c3521caa9
commit 8f052b4081
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ import org.zkoss.zk.ui.sys.WebAppCtrl;
*/ */
public class ZkAtmosphereHandler implements AtmosphereHandler { public class ZkAtmosphereHandler implements AtmosphereHandler {
private static final String SESSION_NOT_FOUND = "SessionNotFound";
private final Logger log = LoggerFactory.getLogger(this.getClass()); private final Logger log = LoggerFactory.getLogger(this.getClass());
@Override @Override
@ -111,7 +112,7 @@ public class ZkAtmosphereHandler implements AtmosphereHandler {
Session session = WebManager.getSession(resource.getAtmosphereConfig().getServletContext(), request, false); Session session = WebManager.getSession(resource.getAtmosphereConfig().getServletContext(), request, false);
if (session == null) { if (session == null) {
log.warn("Could not find session: " + request.getRequestURI()); log.warn("Could not find session: " + request.getRequestURI());
return new Either<String, Session>("Could not find session", null); return new Either<String, Session>(SESSION_NOT_FOUND, null);
} else { } else {
return new Either<String, Session>(null, session); return new Either<String, Session>(null, session);
} }
@ -128,7 +129,7 @@ public class ZkAtmosphereHandler implements AtmosphereHandler {
if (error != null && serverPushEither.getRightValue() == null) { if (error != null && serverPushEither.getRightValue() == null) {
if (log.isDebugEnabled()) if (log.isDebugEnabled())
log.warn("Bad Request. Error="+error+", Request="+resource.getRequest().getRequestURI()); log.warn("Bad Request. Error="+error+", Request="+resource.getRequest().getRequestURI());
response.setStatus(HttpServletResponse.SC_NO_CONTENT); response.setStatus(HttpServletResponse.SC_BAD_REQUEST, error);
response.getWriter().write(""); response.getWriter().write("");
response.getWriter().flush(); response.getWriter().flush();
return; return;

6
org.adempiere.ui.zk/WEB-INF/src/web/js/jawwa/atmosphere/serverpush.js
View File

@ -58,7 +58,11 @@
this.ajaxOptions.complete = function() { this.ajaxOptions.complete = function() {
if (me.trace) if (me.trace)
console.log("complete"+ " dtid: " + me.desktop.id); console.log("complete"+ " dtid: " + me.desktop.id);
me._schedule(); if (me._req && me._req.statusText == "SessionNotFound" && me._req.status == 400) {
;//stop sent request:IDEMPIERE-4237
} else {
me._schedule();
}
}; };
}, },
_schedule: function() { _schedule: function() {