From 8d3ac0d340ce8a0d5aa9130b5b977bde91910861 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Tue, 5 Jan 2016 02:54:08 +0100 Subject: [PATCH] Bug fix and improved logging for Sync Client Former-commit-id: 35e5f30d32f5b2e486ef9ffccf73e71426ddecd1 --- src/se/koc/hal/HalContext.java | 2 +- src/se/koc/hal/deamon/DataSynchronizationDaemon.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/se/koc/hal/HalContext.java b/src/se/koc/hal/HalContext.java index 55ea9e79..1f38e078 100755 --- a/src/se/koc/hal/HalContext.java +++ b/src/se/koc/hal/HalContext.java @@ -45,7 +45,7 @@ public class HalContext { try { // Read conf fileConf = new Properties(defaultFileConf); - if (FileUtil.find(CONF_FILE).exists()) { + if (FileUtil.find(CONF_FILE) != null) { FileReader in = new FileReader(CONF_FILE); fileConf.load(in); in.close(); diff --git a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java index 9655bb26..646fadd6 100755 --- a/src/se/koc/hal/deamon/DataSynchronizationDaemon.java +++ b/src/se/koc/hal/deamon/DataSynchronizationDaemon.java @@ -72,6 +72,7 @@ public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implemen PreparedStatement stmt = HalContext.getDB().getPreparedStatement("SELECT * FROM sensor_data_aggr WHERE sensor_id == ? AND sequence_id > ?"); stmt.setLong(1, req.sensorId); stmt.setLong(2, req.offsetSequenceId); + logger.fine("Client requesting: sensorId: "+req.sensorId+", offset: "+req.offsetSequenceId); SensorDataListDTO list = DBConnection.exec(stmt, new SQLResultHandler() { @Override public SensorDataListDTO handleQueryResult(Statement stmt, ResultSet result) throws SQLException { @@ -88,6 +89,7 @@ public class DataSynchronizationDaemon extends ThreadedTCPNetworkServer implemen return list; } }); + logger.fine("Sending "+ list.size() +" sensor data items to client"); out.writeObject(list); } }