From 3e9d255532be39f1aca4aa71fc566958bad50ddc Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Fri, 29 Jan 2016 09:25:21 +0100 Subject: [PATCH] Better exception logging Former-commit-id: 656f45de3ad89a53068e37d75b24297f7dbff446 --- src/se/hal/deamon/PCDataSynchronizationClient.java | 2 +- src/se/hal/deamon/SensorDataAggregatorDaemon.java | 10 +++++----- src/se/hal/deamon/SensorDataCleanupDaemon.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/se/hal/deamon/PCDataSynchronizationClient.java b/src/se/hal/deamon/PCDataSynchronizationClient.java index 036c4a7c..fbb4e4c2 100755 --- a/src/se/hal/deamon/PCDataSynchronizationClient.java +++ b/src/se/hal/deamon/PCDataSynchronizationClient.java @@ -117,7 +117,7 @@ public class PCDataSynchronizationClient implements HalDaemon { } } catch (SQLException e) { - logger.log(Level.SEVERE, null, e); + logger.log(Level.SEVERE, "Thread has crashed", e); } } diff --git a/src/se/hal/deamon/SensorDataAggregatorDaemon.java b/src/se/hal/deamon/SensorDataAggregatorDaemon.java index f37aff17..61bbfa33 100755 --- a/src/se/hal/deamon/SensorDataAggregatorDaemon.java +++ b/src/se/hal/deamon/SensorDataAggregatorDaemon.java @@ -36,8 +36,8 @@ public class SensorDataAggregatorDaemon implements HalDaemon { aggregateSensor(sensor); } logger.fine("Aggregation Done"); - } catch (SQLException e) { - logger.log(Level.SEVERE, null, e); + } catch (Exception e) { + logger.log(Level.SEVERE, "Thread has crashed", e); } } @@ -47,9 +47,9 @@ public class SensorDataAggregatorDaemon implements HalDaemon { 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"); - aggrigateAggregatedData(sensor, TimeUtility.FIVE_MINUTES_IN_MS, TimeUtility.HOUR_IN_MS); + aggregateAggregatedData(sensor, TimeUtility.FIVE_MINUTES_IN_MS, TimeUtility.HOUR_IN_MS); logger.fine("aggregating one hour periods into one day periods"); - aggrigateAggregatedData(sensor, TimeUtility.HOUR_IN_MS, TimeUtility.DAY_IN_MS); + aggregateAggregatedData(sensor, TimeUtility.HOUR_IN_MS, TimeUtility.DAY_IN_MS); //}else{ // logger.fine("The sensor type("+ sensor.getSensorData().getClass().getName() +") is not supported by the aggregation daemon. Ignoring"); //} @@ -97,7 +97,7 @@ public class SensorDataAggregatorDaemon implements HalDaemon { * @param fromPeriodSizeInMs The period length in ms to aggregate from * @param toPeriodSizeInMs The period length in ms to aggregate to */ - private void aggrigateAggregatedData(Sensor sensor, long fromPeriodSizeInMs, long toPeriodSizeInMs){ + private void aggregateAggregatedData(Sensor sensor, long fromPeriodSizeInMs, long toPeriodSizeInMs){ long sensorId = sensor.getId(); AggregationMethod aggrMethod = sensor.getAggregationMethod(); int expectedSampleCount = (int)Math.ceil((double)toPeriodSizeInMs / (double)fromPeriodSizeInMs); diff --git a/src/se/hal/deamon/SensorDataCleanupDaemon.java b/src/se/hal/deamon/SensorDataCleanupDaemon.java index c68af297..f504d7bd 100755 --- a/src/se/hal/deamon/SensorDataCleanupDaemon.java +++ b/src/se/hal/deamon/SensorDataCleanupDaemon.java @@ -35,8 +35,8 @@ public class SensorDataCleanupDaemon implements HalDaemon { cleanupSensor(sensor); } logger.fine("Data cleanup done"); - } catch (SQLException e) { - e.printStackTrace(); + } catch (Exception e) { + logger.log(Level.SEVERE, "Thread has crashed", e); } }