From 1e4bc587bc94d714f4e68960b517b76a96e85bea Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 15 Jan 2016 14:00:41 +0100 Subject: [PATCH] some improvements Former-commit-id: d617fda63304602d5db63711ca7bc70d4d27e51e --- src/se/hal/deamon/SensorDataCleanupDaemon.java | 4 ++-- web-resource/index.tmpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/se/hal/deamon/SensorDataCleanupDaemon.java b/src/se/hal/deamon/SensorDataCleanupDaemon.java index d415764a..100b7007 100755 --- a/src/se/hal/deamon/SensorDataCleanupDaemon.java +++ b/src/se/hal/deamon/SensorDataCleanupDaemon.java @@ -42,7 +42,7 @@ public class SensorDataCleanupDaemon implements HalDaemon { public void cleanupSensor(Sensor sensor) { //if(sensor instanceof PowerConsumptionSensorData){ - logger.fine("The sensor is of type: " + sensor.getDeviceData().getClass().getName()); + //logger.fine("The sensor is of type: " + sensor.getDeviceData().getClass().getName()); // this will instantiate the external sensor data if(sensor.getUser().isExternal()){ cleanupExternalSensorData(sensor.getId(), TimeUtility.FIVE_MINUTES_IN_MS, TimeUtility.DAY_IN_MS); cleanupExternalSensorData(sensor.getId(), TimeUtility.DAY_IN_MS, TimeUtility.WEEK_IN_MS); @@ -134,7 +134,7 @@ public class SensorDataCleanupDaemon implements HalDaemon { if(sensorId != result.getInt("sensor_id")){ throw new IllegalArgumentException("Found entry for aggregation for the wrong sensorId (expecting: "+sensorId+", but was: "+result.getInt("sensor_id")+")"); } - logger.finer("Deleting sensor aggregate entry timestamp: "+ result.getLong("timestamp_start") +" - "+ result.getLong("timestamp_end") + " (" + TimeUtility.msToString(result.getLong("timestamp_end")-result.getLong("timestamp_start")) + ")"); + logger.finer("Deleting sensor(id: "+ sensorId +") aggregate entry timestamp: "+ result.getLong("timestamp_start") +" - "+ result.getLong("timestamp_end") + " (" + TimeUtility.msToString(result.getLong("timestamp_end")-result.getLong("timestamp_start")) + ")"); preparedDeleteStmt.setInt(1, result.getInt("sensor_id")); preparedDeleteStmt.setLong(2, result.getLong("sequence_id")); preparedDeleteStmt.addBatch(); diff --git a/web-resource/index.tmpl b/web-resource/index.tmpl index b89e07de..25bae537 100755 --- a/web-resource/index.tmpl +++ b/web-resource/index.tmpl @@ -28,7 +28,7 @@ - HAL + HAL