From b06c9c0234177dca7a7e5fd499fecaaeb5895c98 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Wed, 13 Jan 2016 18:16:25 +0100 Subject: [PATCH] detected events bugfix Former-commit-id: 6b223c4412b79acbebeb48352c73b6740222a189 --- src/se/hal/ControllerManager.java | 4 ++-- src/se/hal/page/EventConfigHttpPage.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/se/hal/ControllerManager.java b/src/se/hal/ControllerManager.java index cc4d645c..fd773b91 100755 --- a/src/se/hal/ControllerManager.java +++ b/src/se/hal/ControllerManager.java @@ -114,8 +114,8 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor logger.finest("Received report from sensor: "+ sensorData); } else { // unknown sensor + logger.finest("Received report from unregistered sensor: "+ sensorData); if(!detectedSensors.contains(sensorData)) { - logger.finest("Received report from unregistered sensor: "+ sensorData); detectedSensors.add(sensorData); } } @@ -192,8 +192,8 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor logger.finest("Received report from event: "+ eventData); } else { // unknown sensor + logger.info("Received report from unregistered event: "+ eventData); if(!detectedEvents.contains(eventData)) { - logger.finest("Received report from unregistered event: "+ eventData); detectedEvents.add(eventData); } } diff --git a/src/se/hal/page/EventConfigHttpPage.java b/src/se/hal/page/EventConfigHttpPage.java index 0e908f00..c0f03e8d 100755 --- a/src/se/hal/page/EventConfigHttpPage.java +++ b/src/se/hal/page/EventConfigHttpPage.java @@ -84,6 +84,7 @@ public class EventConfigHttpPage extends HalHttpPage { tmpl.set("user", localUser); tmpl.set("localEvent", Event.getLocalEvents(db)); tmpl.set("localEventConf", eventConfigurations); + tmpl.set("detectedEvents", ControllerManager.getInstance().getDetectedEvents()); tmpl.set("availableEvents", ControllerManager.getInstance().getAvailableEvents());