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

[freeboxos] Reduce log level for discovery warnings to debug (#17199)

Browse Source 
* Avoid repeated discovery warnings every 10 minutes
* Discover VMs and home automation only when available

Signed-off-by: Laurent Garnier <lg.hc@free.fr>
Signed-off-by: Ciprian Pascu <contact@ciprianpascu.ro>
This commit is contained in:
lolodomo 2024-08-13 22:04:42 +02:00 committed by Ciprian Pascu
parent f4aae57417
commit 0f01ad2118
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
bundles/org.openhab.binding.freeboxos/src/main/java/org/openhab/binding/freeboxos/internal/discovery/FreeboxOsDiscoveryService.java
View File

@ -72,6 +72,9 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
private final Logger logger = LoggerFactory.getLogger(FreeboxOsDiscoveryService.class); private final Logger logger = LoggerFactory.getLogger(FreeboxOsDiscoveryService.class);
private boolean hasVm = true;
private boolean hasHomeAutomation = true;
private Optional<ScheduledFuture<?>> backgroundFuture = Optional.empty(); private Optional<ScheduledFuture<?>> backgroundFuture = Optional.empty();
public FreeboxOsDiscoveryService() { public FreeboxOsDiscoveryService() {
@ -111,13 +114,17 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
discoverPlugs(bridgeUID); discoverPlugs(bridgeUID);
discoverRepeater(bridgeUID, lanHosts); discoverRepeater(bridgeUID, lanHosts);
discoverPlayer(bridgeUID, lanHosts); discoverPlayer(bridgeUID, lanHosts);
discoverVM(bridgeUID, lanHosts); if (hasVm) {
discoverHome(bridgeUID); discoverVM(bridgeUID, lanHosts);
}
if (hasHomeAutomation) {
discoverHome(bridgeUID);
}
if (thingHandler.getConfiguration().discoverNetDevice) { if (thingHandler.getConfiguration().discoverNetDevice) {
discoverHosts(bridgeUID, lanHosts); discoverHosts(bridgeUID, lanHosts);
} }
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error while requesting data for things discovery: {}", e.getMessage()); logger.debug("Error while requesting data for things discovery: {}", e.getMessage());
} }
} }
} }
@ -128,7 +135,7 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
thingHandler.getManager(HomeManager.class).getHomeNodes().forEach( thingHandler.getManager(HomeManager.class).getHomeNodes().forEach(
node -> builder.configure(bridgeUID, node).ifPresent(result -> thingDiscovered(result.build()))); node -> builder.configure(bridgeUID, node).ifPresent(result -> thingDiscovered(result.build())));
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error discovering Home: {}", e.getMessage()); logger.debug("Error discovering Home: {}", e.getMessage());
} }
} }
@ -138,7 +145,7 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
thingHandler.getManager(FreeplugManager.class).getPlugs() thingHandler.getManager(FreeplugManager.class).getPlugs()
.forEach(plug -> thingDiscovered(builder.configure(bridgeUID, plug).build())); .forEach(plug -> thingDiscovered(builder.configure(bridgeUID, plug).build()));
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error discovering freeplugs: {}", e.getMessage()); logger.debug("Error discovering freeplugs: {}", e.getMessage());
} }
} }
@ -149,7 +156,7 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
statuses = thingHandler.getManager(PhoneManager.class).getPhoneStatuses(); statuses = thingHandler.getManager(PhoneManager.class).getPhoneStatuses();
statuses.forEach(phone -> thingDiscovered(builder.configure(bridgeUID, phone).build())); statuses.forEach(phone -> thingDiscovered(builder.configure(bridgeUID, phone).build()));
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error discovering phones: {}", e.getMessage()); logger.debug("Error discovering phones: {}", e.getMessage());
} }
if (!statuses.isEmpty()) { if (!statuses.isEmpty()) {
ThingUID thingUID = new ThingUID(THING_TYPE_CALL, bridgeUID, "landline"); ThingUID thingUID = new ThingUID(THING_TYPE_CALL, bridgeUID, "landline");
@ -180,7 +187,7 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
thingDiscovered(builder.build()); thingDiscovered(builder.build());
}); });
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error discovering Hosts: {}", e.getMessage()); logger.debug("Error discovering Hosts: {}", e.getMessage());
} }
} }
@ -199,7 +206,7 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
thingDiscovered(discoveryResult); thingDiscovered(discoveryResult);
}); });
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error discovering VM: {}", e.getMessage()); logger.debug("Error discovering VM: {}", e.getMessage());
} }
} }
@ -219,7 +226,7 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
thingDiscovered(discoveryResult); thingDiscovered(discoveryResult);
}); });
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error discovering Repeater: {}", e.getMessage()); logger.debug("Error discovering Repeater: {}", e.getMessage());
} }
} }
@ -227,6 +234,9 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
try { try {
Config config = thingHandler.getManager(SystemManager.class).getConfig(); Config config = thingHandler.getManager(SystemManager.class).getConfig();
hasVm = config.modelInfo().hasVm();
hasHomeAutomation = config.modelInfo().hasHomeAutomation();
ThingTypeUID targetType = config.boardName().startsWith("fbxgw7") ? THING_TYPE_DELTA ThingTypeUID targetType = config.boardName().startsWith("fbxgw7") ? THING_TYPE_DELTA
: THING_TYPE_REVOLUTION; : THING_TYPE_REVOLUTION;
ThingUID thingUID = new ThingUID(targetType, bridgeUID, config.serial()); ThingUID thingUID = new ThingUID(targetType, bridgeUID, config.serial());
@ -237,7 +247,7 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
.withProperty(Thing.PROPERTY_MAC_ADDRESS, config.mac().toColonDelimitedString()).build(); .withProperty(Thing.PROPERTY_MAC_ADDRESS, config.mac().toColonDelimitedString()).build();
thingDiscovered(discoveryResult); thingDiscovered(discoveryResult);
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error discovering Server: {}", e.getMessage()); logger.debug("Error discovering Server: {}", e.getMessage());
} }
} }
@ -254,7 +264,7 @@ public class FreeboxOsDiscoveryService extends AbstractThingHandlerDiscoveryServ
thingDiscovered(discoveryResult); thingDiscovered(discoveryResult);
} }
} catch (FreeboxException e) { } catch (FreeboxException e) {
logger.warn("Error discovering Player: {}", e.getMessage()); logger.debug("Error discovering Player: {}", e.getMessage());
} }
} }
} }