demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-10 15:11:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[mqtt.homeassistant] fix unbounded growth of config for device_trigger (#17894)

Browse Source 
Because of how it shares a channel, whenever openHAB was rebooted and it
would first restore the device trigger components from the channel configuration,
and then from the MQTT message, it didn't identify it as the same component
as before, and so would merge into another instance of itself. My Things.json
is normally 13MB, and had grown to 545MB, and my openHAB was constantly having
memory issues! So now just make sure we only keep unique information, which
will automatically clean up anyone in a bad state.

Signed-off-by: Cody Cutrer <cody@cutrer.us>
This commit is contained in:
Cody Cutrer 2024-12-13 02:26:58 -07:00 committed by GitHub
parent 334c909b90
commit c6f2fca499
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/component/DeviceTrigger.java
View File

@ -111,17 +111,22 @@ public class DeviceTrigger extends AbstractComponent<DeviceTrigger.ChannelConfig
newConfiguration.put("nodeid", currentConfiguration.get("nodeid")); newConfiguration.put("nodeid", currentConfiguration.get("nodeid"));
Object objectIdObject = currentConfiguration.get("objectid"); Object objectIdObject = currentConfiguration.get("objectid");
if (objectIdObject instanceof String objectIdString) { if (objectIdObject instanceof String objectIdString) {
newConfiguration.put("objectid", List.of(objectIdString, other.getHaID().objectID)); if (!objectIdString.equals(other.getHaID().objectID)) {
newConfiguration.put("objectid", List.of(objectIdString, other.getHaID().objectID));
}
} else if (objectIdObject instanceof List<?> objectIdList) { } else if (objectIdObject instanceof List<?> objectIdList) {
newConfiguration.put("objectid", newConfiguration.put("objectid", Stream.concat(objectIdList.stream(), Stream.of(other.getHaID().objectID))
Stream.concat(objectIdList.stream(), Stream.of(other.getHaID().objectID)).toList()); .sorted().distinct().toList());
} }
Object configObject = currentConfiguration.get("config"); Object configObject = currentConfiguration.get("config");
if (configObject instanceof String configString) { if (configObject instanceof String configString) {
newConfiguration.put("config", List.of(configString, other.getChannelConfigurationJson())); if (!configString.equals(other.getChannelConfigurationJson())) {
newConfiguration.put("config", List.of(configString, other.getChannelConfigurationJson()));
}
} else if (configObject instanceof List<?> configList) { } else if (configObject instanceof List<?> configList) {
newConfiguration.put("config", newConfiguration.put("config",
Stream.concat(configList.stream(), Stream.of(other.getChannelConfigurationJson())).toList()); Stream.concat(configList.stream(), Stream.of(other.getChannelConfigurationJson())).sorted()
.distinct().toList());
} }
// Append payload to allowed values // Append payload to allowed values
@ -130,7 +135,8 @@ public class DeviceTrigger extends AbstractComponent<DeviceTrigger.ChannelConfig
// Need to accept anything // Need to accept anything
value = new TextValue(); value = new TextValue();
} else { } else {
String[] newValues = Stream.concat(payloads.stream(), Stream.of(otherPayload)).toArray(String[]::new); String[] newValues = Stream.concat(payloads.stream(), Stream.of(otherPayload)).distinct()
.toArray(String[]::new);
value = new TextValue(newValues); value = new TextValue(newValues);
} }