diff --git a/src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml b/src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml
--- a/src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml
+++ b/src-db/database/model/tables/OBMOBC_SERVER_DEFINITION.xml
@@ -97,6 +97,14 @@
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -980,7 +980,7 @@
-
+
@@ -1333,6 +1333,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3204,6 +3241,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -1,5 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -379,6 +391,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -730,4 +730,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/mobile/core/servercontroller/MobileServerStatusInformation.java b/src/org/openbravo/mobile/core/servercontroller/MobileServerStatusInformation.java
--- a/src/org/openbravo/mobile/core/servercontroller/MobileServerStatusInformation.java
+++ b/src/org/openbravo/mobile/core/servercontroller/MobileServerStatusInformation.java
@@ -10,6 +10,13 @@
import java.io.IOException;
import java.io.Writer;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -26,12 +33,15 @@
import org.openbravo.dal.service.OBDal;
import org.openbravo.mobile.core.process.JSONRowConverter;
import org.openbravo.mobile.core.process.ProcessHQLQuery;
+import org.openbravo.service.json.JsonUtils;
@AuthenticationManager.Stateless
public class MobileServerStatusInformation extends ProcessHQLQuery {
private static final Logger log = Logger.getLogger(MobileServerStatusInformation.class);
+ private static SimpleDateFormat dateTimeFormat = JsonUtils.createDateTimeFormat();
+
@Override
public void exec(Writer w, JSONObject jsonsent) throws IOException, ServletException {
try {
@@ -45,7 +55,8 @@
query.setParameter("serverId", MobileServerController.getInstance()
.getThisServerDefinitionId());
final String qryResult = query.uniqueResult();
- updateLastPingAndTransitionToOnlineIfNeeded(session);
+ updateLastPingAndTransitionToOnlineIfNeeded(session,
+ jsonsent.has("deltaAge") ? jsonsent.getString("deltaAge") : null);
if (qryResult != null) {
w.write("\"serverStatus\": \"" + qryResult + "\"");
}
@@ -57,15 +68,41 @@
}
}
- private void updateLastPingAndTransitionToOnlineIfNeeded(Session session) {
+ private void updateLastPingAndTransitionToOnlineIfNeeded(Session session, String deltaAgeStr)
+ throws ParseException {
Date lastPingFromCentral = ServerStateBackground.getLastPingFromCentral();
Date lastPingThreshold = ServerStateBackground.getLastPingThreshold();
boolean lastPingFromCentralWasExpired = lastPingFromCentral.before(lastPingThreshold);
- @SuppressWarnings("rawtypes")
- final Query query = session
- .createQuery("UPDATE OBMOBC_SERVER_DEFINITION SET lastPing=now() WHERE servertype = 'MAIN'");
- query.executeUpdate();
+ Date deltaAge = getFromString(deltaAgeStr);
+
+ Connection connection = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ connection = OBDal.getInstance().getConnection();
+ ps = connection
+ .prepareStatement("UPDATE OBMOBC_SERVER_DEFINITION SET last_Ping=now(), delta_age=? WHERE servertype = 'MAIN'");
+ if (deltaAge == null) {
+ ps.setNull(1, Types.TIMESTAMP);
+ } else {
+ ps.setTimestamp(1, new Timestamp(deltaAge.getTime()));
+ }
+ ps.executeUpdate();
+ } catch (Exception ex) {
+ log.error("Error while setting delta age", ex);
+ } finally {
+ try {
+ if (ps != null) {
+ ps.close();
+ }
+ if (rs != null) {
+ rs.close();
+ }
+ } catch (Exception e) {
+ log.error("Error while releasing a prepared statement", e);
+ }
+ }
if (lastPingFromCentralWasExpired) {
log.info("Store offline, new Ping received from central server after >3 pings missed. Transitioning to online.");
@@ -85,6 +122,13 @@
return hqls;
}
+ private synchronized Date getFromString(String value) throws ParseException {
+ if (value == null) {
+ return null;
+ }
+ return dateTimeFormat.parse(value);
+ }
+
@Override
protected boolean bypassSecurity() {
return true;
diff --git a/src/org/openbravo/mobile/core/servercontroller/MobileServerUtils.java b/src/org/openbravo/mobile/core/servercontroller/MobileServerUtils.java
--- a/src/org/openbravo/mobile/core/servercontroller/MobileServerUtils.java
+++ b/src/org/openbravo/mobile/core/servercontroller/MobileServerUtils.java
@@ -10,6 +10,10 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.Date;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -23,6 +27,7 @@
import org.openbravo.base.secureApp.AllowedCrossDomainsHandler;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
+import org.openbravo.database.ConnectionProvider;
import org.openbravo.erpCommon.businessUtility.Preferences;
import org.openbravo.erpCommon.utility.PropertyException;
import org.openbravo.mobile.core.MobileServerDefinition;
@@ -31,6 +36,7 @@
import org.openbravo.model.ad.domain.Preference;
import org.openbravo.model.ad.system.Client;
import org.openbravo.model.common.enterprise.Organization;
+import org.openbravo.service.db.DalConnectionProvider;
/**
* @author mtaal
@@ -39,6 +45,8 @@
private static final Logger log = Logger.getLogger(MobileServerUtils.class);
+ private static final int FIVE_MINUTES = 5 * 60;
+
public static final String MOBILE_SERVER_KEY = "mobile.server.key";
public static final String MAIN_SERVER = "MAIN";
public static final String STORE_SERVER = "STORE";
@@ -46,6 +54,51 @@
private static Boolean multiServerControllerEnabled = null;
+ public static boolean isDeltaAgeExpired() {
+
+ Date deltaAge = null;
+ Connection connection = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ ConnectionProvider readOnlyCP = DalConnectionProvider.getReadOnlyConnectionProvider();
+ try {
+ connection = readOnlyCP.getTransactionConnection();
+ ps = connection
+ .prepareStatement("SELECT delta_age FROM obmobc_server_definition WHERE servertype = 'MAIN'");
+ ps.setMaxRows(1);
+ rs = ps.executeQuery();
+ while (rs.next()) {
+ if (rs.wasNull()) {
+ deltaAge = null;
+ } else {
+ deltaAge = rs.getTimestamp(1);
+ }
+ }
+ } catch (Exception ex) {
+ log.error("Error while getting delta age", ex);
+ } finally {
+ try {
+ if (ps != null) {
+ ps.close();
+ }
+ if (rs != null) {
+ rs.close();
+ }
+ } catch (Exception e) {
+ log.error("Error while releasing a prepared statement", e);
+ }
+ }
+
+ if (deltaAge == null) {
+ return false;
+ }
+
+ int maxDeltaAge = MobileServerUtils
+ .getIntegerPreference("OBMOBC_MaxDeltaSyncAge", FIVE_MINUTES);
+
+ return ((System.currentTimeMillis() - deltaAge.getTime()) / 1000) > maxDeltaAge;
+ }
+
public static boolean isInvalidOrigin(HttpServlet servlet, HttpServletRequest request,
HttpServletResponse response) {
try {
diff --git a/src/org/openbravo/mobile/core/servercontroller/ServerStateBackground.java b/src/org/openbravo/mobile/core/servercontroller/ServerStateBackground.java
--- a/src/org/openbravo/mobile/core/servercontroller/ServerStateBackground.java
+++ b/src/org/openbravo/mobile/core/servercontroller/ServerStateBackground.java
@@ -8,6 +8,11 @@
*/
package org.openbravo.mobile.core.servercontroller;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashSet;
@@ -39,6 +44,7 @@
import org.openbravo.scheduling.ProcessContext;
import org.openbravo.scheduling.ProcessLogger;
import org.openbravo.service.db.DalBaseProcess;
+import org.openbravo.service.json.JsonUtils;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@@ -55,6 +61,8 @@
private static final int SERVERS_PER_THREAD = 60;
private static final int WAIT_TIME = 1000 * 60 * 10;
+ private static SimpleDateFormat dateTimeFormat = JsonUtils.createDateTimeFormat();
+
private Boolean offlineTriggerOnlyByUserActions = null;
private Set pingServerCheckers;
@@ -472,9 +480,19 @@
private void pingServer(String serverId, final JSONObject parameters, final String queryParams) {
MobileServerDefinition srv = OBDal.getInstance().get(MobileServerDefinition.class, serverId);
+
String newStatus = srv.getStatus();
JSONObject resp = null;
try {
+
+ // determine deltaage and pass it in
+ Date deltaAge = getOldestAgeBatchForServer(srv.getName());
+ String deltaAgeStr = null;
+ if (deltaAge != null) {
+ deltaAgeStr = convertToString(deltaAge);
+ }
+ parameters.put("deltaAge", deltaAgeStr);
+
resp = new JSONObject(MobileServerRequestExecutor.getInstance().request(srv,
MobileServerUtils.OBWSPATH + MobileServerStatusInformation.class.getName(),
queryParams, "POST", parameters)).getJSONObject("response");
@@ -497,6 +515,42 @@
}
}
+ private synchronized String convertToString(Date dt) {
+ return dateTimeFormat.format(dt);
+ }
+
+ private Date getOldestAgeBatchForServer(String serverId) {
+ Connection connection = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ connection = OBDal.getInstance().getConnection();
+ ps = connection
+ .prepareStatement("SELECT create_time FROM sym_outgoing_batch where channel_id <> 'reload' and node_id=? and status<>'OK' order by create_time asc");
+ ps.setMaxRows(1);
+ ps.setString(1, serverId);
+ rs = ps.executeQuery();
+ while (rs.next()) {
+ return rs.getTimestamp(1);
+ }
+ } catch (Exception ex) {
+ log4j.error("Error while getting oldest outgoing batch", ex);
+ } finally {
+ try {
+ if (ps != null) {
+ ps.close();
+ }
+ if (rs != null) {
+ rs.close();
+ }
+ } catch (Exception e) {
+ log4j.error("Error while releasing a prepared statement", e);
+ }
+ }
+
+ return null;
+ }
+
private String getStatusFromResponse(JSONObject response) throws JSONException {
String newStatus = null;
if (response != null) {