public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix storage usage (#12305) 

Signed-off-by: Eugen Freiter <freiter@gmx.de>
This commit is contained in:
eugen 2022-02-22 06:50:19 +01:00 committed by GitHub
parent 00e16f5b4e
commit 9e6b952b66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitChangeListener.java
View File

@ -35,7 +35,6 @@ import org.openhab.core.items.Metadata;
import org.openhab.core.items.MetadataKey; import org.openhab.core.items.MetadataKey;
import org.openhab.core.items.MetadataRegistry; import org.openhab.core.items.MetadataRegistry;
import org.openhab.core.storage.Storage; import org.openhab.core.storage.Storage;
import org.openhab.core.storage.StorageService;
import org.openhab.io.homekit.internal.accessories.HomekitAccessoryFactory; import org.openhab.io.homekit.internal.accessories.HomekitAccessoryFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -79,11 +78,11 @@ public class HomekitChangeListener implements ItemRegistryChangeListener {
private final Debouncer applyUpdatesDebouncer; private final Debouncer applyUpdatesDebouncer;
HomekitChangeListener(ItemRegistry itemRegistry, HomekitSettings settings, MetadataRegistry metadataRegistry, HomekitChangeListener(ItemRegistry itemRegistry, HomekitSettings settings, MetadataRegistry metadataRegistry,
StorageService storageService) { Storage<String> storage) {
this.itemRegistry = itemRegistry; this.itemRegistry = itemRegistry;
this.settings = settings; this.settings = settings;
this.metadataRegistry = metadataRegistry; this.metadataRegistry = metadataRegistry;
storage = storageService.getStorage(HomekitAuthInfoImpl.STORAGE_KEY); this.storage = storage;
this.applyUpdatesDebouncer = new Debouncer("update-homekit-devices", scheduler, Duration.ofMillis(1000), this.applyUpdatesDebouncer = new Debouncer("update-homekit-devices", scheduler, Duration.ofMillis(1000),
Clock.systemUTC(), this::applyUpdates); Clock.systemUTC(), this::applyUpdates);
metadataChangeListener = new RegistryChangeListener<Metadata>() { metadataChangeListener = new RegistryChangeListener<Metadata>() {

8
bundles/org.openhab.io.homekit/src/main/java/org/openhab/io/homekit/internal/HomekitImpl.java
View File

@ -37,6 +37,7 @@ import org.openhab.core.items.MetadataRegistry;
import org.openhab.core.net.CidrAddress; import org.openhab.core.net.CidrAddress;
import org.openhab.core.net.NetworkAddressChangeListener; import org.openhab.core.net.NetworkAddressChangeListener;
import org.openhab.core.net.NetworkAddressService; import org.openhab.core.net.NetworkAddressService;
import org.openhab.core.storage.Storage;
import org.openhab.core.storage.StorageService; import org.openhab.core.storage.StorageService;
import org.openhab.io.homekit.Homekit; import org.openhab.io.homekit.Homekit;
import org.osgi.framework.Constants; import org.osgi.framework.Constants;
@ -70,6 +71,7 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener {
private final NetworkAddressService networkAddressService; private final NetworkAddressService networkAddressService;
private final ConfigurationAdmin configAdmin; private final ConfigurationAdmin configAdmin;
private final Storage<String> storage;
private HomekitAuthInfoImpl authInfo; private HomekitAuthInfoImpl authInfo;
private HomekitSettings settings; private HomekitSettings settings;
@ -92,11 +94,11 @@ public class HomekitImpl implements Homekit, NetworkAddressChangeListener {
this.configAdmin = configAdmin; this.configAdmin = configAdmin;
this.settings = processConfig(properties); this.settings = processConfig(properties);
this.mdnsClient = mdnsClient; this.mdnsClient = mdnsClient;
this.storage = storageService.getStorage(HomekitAuthInfoImpl.STORAGE_KEY);
networkAddressService.addNetworkAddressChangeListener(this); networkAddressService.addNetworkAddressChangeListener(this);
this.changeListener = new HomekitChangeListener(itemRegistry, settings, metadataRegistry, storageService); this.changeListener = new HomekitChangeListener(itemRegistry, settings, metadataRegistry, storage);
try { try {
authInfo = new HomekitAuthInfoImpl(storageService.getStorage(HomekitAuthInfoImpl.STORAGE_KEY), settings.pin, authInfo = new HomekitAuthInfoImpl(storage, settings.pin, settings.setupId, settings.blockUserDeletion);
settings.setupId, settings.blockUserDeletion);
startHomekitServer(); startHomekitServer();
} catch (IOException | InvalidAlgorithmParameterException e) { } catch (IOException | InvalidAlgorithmParameterException e) {
logger.warn("cannot activate HomeKit binding. {}", e.getMessage()); logger.warn("cannot activate HomeKit binding. {}", e.getMessage());