From 9b64377d14710eb98a0929eccd1a357da29e7315 Mon Sep 17 00:00:00 2001 From: Mattia Dal Ben Date: Fri, 7 Apr 2023 13:36:15 +0200 Subject: [PATCH] refactor(nm): `org.eclipse.kura.nm` log cleanup/update (#4535) * refactor(nm): add missing log entry on modem reset cancel * refactor: lower overall log verbosity --- .../main/java/org/eclipse/kura/nm/NMDbusConnector.java | 8 ++------ .../java/org/eclipse/kura/nm/NMModemResetHandler.java | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java index 18846917b48..9c361943756 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMDbusConnector.java @@ -387,14 +387,10 @@ private void enableInterface(String deviceId, NetworkProperties properties, Devi Map>> newConnectionSettings = NMSettingsConverter.buildSettings(properties, connection, deviceId, interfaceName, deviceType); - logger.info("New settings parsed"); - DeviceStateLock dsLock = new DeviceStateLock(this.dbusConnection, device.getObjectPath(), NMDeviceState.NM_DEVICE_STATE_CONFIG); if (connection.isPresent()) { - logger.info("Current settings available"); - connection.get().Update(newConnectionSettings); this.nm.ActivateConnection(new DBusPath(connection.get().getObjectPath()), new DBusPath(device.getObjectPath()), new DBusPath("/")); @@ -643,7 +639,7 @@ private Optional getAssociatedConnection(Device dev) throws DBusExce if (appliedConnection.isPresent()) { return appliedConnection; } else { - logger.info("Active connection not found, looking for avaliable connections."); + logger.debug("Active connection not found, looking for avaliable connections."); List availableConnections = getAvaliableConnections(dev); @@ -860,4 +856,4 @@ private List getBearersPropertiesFromPaths(List bearerPath } return bearerProperties; } -} \ No newline at end of file +} diff --git a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMModemResetHandler.java b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMModemResetHandler.java index e7159d80d16..c40475ea185 100644 --- a/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMModemResetHandler.java +++ b/kura/org.eclipse.kura.nm/src/main/java/org/eclipse/kura/nm/NMModemResetHandler.java @@ -84,6 +84,7 @@ private boolean timerAlreadyScheduled() { public void clearTimer() { if (timerAlreadyScheduled()) { + logger.info("Clearing timer for {}. Cancelling scheduled modem reset...", this.nmDevicePath); this.scheduledTasks.cancel(); this.scheduledTasks = null; }