From 61c88ed4caeadf4873cdd0c565bdcabcce118758 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 14 Jan 2016 20:25:50 +0100 Subject: [PATCH] More bugfixes Former-commit-id: 4d29b4d813ee2e9dba063afeb081742e9537125a --- src/se/hal/deamon/PCDataSynchronizationClient.java | 4 ++-- src/se/hal/deamon/PCDataSynchronizationDaemon.java | 2 +- src/se/hal/deamon/SensorDataAggregatorDaemon.java | 6 +++--- src/se/hal/deamon/SensorDataCleanupDaemon.java | 4 +++- src/se/hal/struct/Event.java | 6 +++--- src/se/hal/struct/Sensor.java | 4 ++-- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/se/hal/deamon/PCDataSynchronizationClient.java b/src/se/hal/deamon/PCDataSynchronizationClient.java index 2702c490..b5e6b8a0 100755 --- a/src/se/hal/deamon/PCDataSynchronizationClient.java +++ b/src/se/hal/deamon/PCDataSynchronizationClient.java @@ -102,9 +102,9 @@ public class PCDataSynchronizationClient implements HalDaemon { in.close(); s.close(); - } catch (NoRouteToHostException |UnknownHostException|ConnectException e) { + } catch (NoRouteToHostException|UnknownHostException|ConnectException e) { logger.warning("Unable to connect to "+ user.getHostname()+":"+user.getPort() +", "+ e.getMessage()); - } catch (ClassNotFoundException|IOException e) { + } catch (Exception e) { logger.log(Level.SEVERE, null, e); } diff --git a/src/se/hal/deamon/PCDataSynchronizationDaemon.java b/src/se/hal/deamon/PCDataSynchronizationDaemon.java index 240c824e..bcbb7b74 100755 --- a/src/se/hal/deamon/PCDataSynchronizationDaemon.java +++ b/src/se/hal/deamon/PCDataSynchronizationDaemon.java @@ -129,7 +129,7 @@ public class PCDataSynchronizationDaemon extends ThreadedTCPNetworkServer implem in.close(); s.close(); - } catch (ClassNotFoundException|IOException|SQLException e) { + } catch (Exception e) { logger.log(Level.SEVERE, null, e); } logger.fine("User disconnected: "+ s.getInetAddress().getHostName()); diff --git a/src/se/hal/deamon/SensorDataAggregatorDaemon.java b/src/se/hal/deamon/SensorDataAggregatorDaemon.java index 79634274..2e780255 100755 --- a/src/se/hal/deamon/SensorDataAggregatorDaemon.java +++ b/src/se/hal/deamon/SensorDataAggregatorDaemon.java @@ -43,8 +43,8 @@ public class SensorDataAggregatorDaemon implements HalDaemon { } public void aggregateSensor(Sensor sensor) { - //if(sensor instanceof PowerConsumptionSensor){ - logger.fine("The sensor is of type: " + PowerConsumptionSensor.class.getSimpleName()); + //if(sensor.getSensorData() instanceof PowerConsumptionSensor){ + logger.fine("The sensor is of type: " + sensor.getSensorData().getClass().getName()); logger.fine("aggregating raw data to five minute periods"); aggregateRawData(sensor, TimeUtility.FIVE_MINUTES_IN_MS, 5); logger.fine("aggregating five minute periods into hour periods"); @@ -52,7 +52,7 @@ public class SensorDataAggregatorDaemon implements HalDaemon { logger.fine("aggregating one hour periods into one day periods"); aggrigateAggregatedData(sensor, TimeUtility.HOUR_IN_MS, TimeUtility.DAY_IN_MS); //}else{ - // logger.fine("The sensor type is not supported by the aggregation daemon. Ignoring"); + // logger.fine("The sensor type("+ sensor.getSensorData().getClass().getName() +") is not supported by the aggregation daemon. Ignoring"); //} } diff --git a/src/se/hal/deamon/SensorDataCleanupDaemon.java b/src/se/hal/deamon/SensorDataCleanupDaemon.java index 71a0c47b..13caaa06 100755 --- a/src/se/hal/deamon/SensorDataCleanupDaemon.java +++ b/src/se/hal/deamon/SensorDataCleanupDaemon.java @@ -43,7 +43,7 @@ public class SensorDataCleanupDaemon implements HalDaemon { public void cleanupSensor(Sensor sensor) { //if(sensor instanceof PowerConsumptionSensor){ - logger.fine("The sensor is of type: " + PowerConsumptionSensor.class.getSimpleName()); + logger.fine("The sensor is of type: " + sensor.getSensorData().getClass().getName()); 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); @@ -58,6 +58,7 @@ public class SensorDataCleanupDaemon implements HalDaemon { /** * Will clear periods only if it has been aggregated and are too old. + * * @param sensorId * @Param referencePeriodlength Will only clear periods older than the newest period of this length. * @Param clearPeriodlength Will clear periods with this length @@ -94,6 +95,7 @@ public class SensorDataCleanupDaemon implements HalDaemon { /** * Will clear periods if they are too old. + * * @param sensorId * @Param clearPeriodlength Will clear periods with this length * @param olderThan Data must be older than this many ms to be cleared from the DB diff --git a/src/se/hal/struct/Event.java b/src/se/hal/struct/Event.java index 9043097f..05dce24e 100755 --- a/src/se/hal/struct/Event.java +++ b/src/se/hal/struct/Event.java @@ -56,7 +56,7 @@ public class Event extends DBBean{ updateConfig(); } public HalEvent getEventData(){ - if(config !=null && eventData == null) { + if(eventData == null) { try { Class c = Class.forName(type); eventData = (HalEvent) c.newInstance(); @@ -92,7 +92,7 @@ public class Event extends DBBean{ return type; } public void setType(String type) { - if( ! this.type.equals(type)) { + if( !this.type.equals(type)) { this.type = type; this.eventData = null; // invalidate current sensor data object } @@ -101,7 +101,7 @@ public class Event extends DBBean{ return config; } public void setConfig(String config) { - if( ! this.config.equals(config)) { + if(this.config == null || !this.config.equals(config)) { this.config = config; this.eventData = null; // invalidate current sensor data object } diff --git a/src/se/hal/struct/Sensor.java b/src/se/hal/struct/Sensor.java index a90fbe6d..f7ada714 100755 --- a/src/se/hal/struct/Sensor.java +++ b/src/se/hal/struct/Sensor.java @@ -124,7 +124,7 @@ public class Sensor extends DBBean{ return type; } public void setType(String type) { - if( ! this.type.equals(type)) { + if( !this.type.equals(type)) { this.type = type; this.sensorData = null; // invalidate current sensor data object } @@ -133,7 +133,7 @@ public class Sensor extends DBBean{ return config; } public void setConfig(String config) { - if( ! this.config.equals(config)) { + if(this.config == null || !this.config.equals(config)) { this.config = config; this.sensorData = null; // invalidate current sensor data object }