ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

detected events bugfix

Browse source 
Former-commit-id: 6b223c4412b79acbebeb48352c73b6740222a189
This commit is contained in:
Ziver Koc 2016-01-13 18:16:25 +01:00
parent 45efb6120d
commit b06c9c0234
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/se/hal/ControllerManager.java
View file

@ -114,8 +114,8 @@ public class ControllerManager implements HalSensorReportListener, HalEventRepor
logger.finest("Received report from sensor: "+ sensorData);
}
else { // unknown sensor
if(!detectedSensors.contains(sensorData)) {
logger.finest("Received report from unregistered sensor: "+ sensorData);
if(!detectedSensors.contains(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);
}
}

1
src/se/hal/page/EventConfigHttpPage.java
View file

@ -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());