Improve the error logging with new DBusProgramError (#2243)

This commit is contained in:
Pascal Vizeli 2020-11-12 09:34:43 +01:00 committed by GitHub
parent c76a4ff422
commit 5416eda1d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -95,7 +95,7 @@ class NetworkManager(CoreSysAttributes):
try: try:
await inet.settings.update(settings) await inet.settings.update(settings)
except DBusError as err: except DBusError as err:
_LOGGER.error("Can't update config on %s", interface.name) _LOGGER.error("Can't update config on %s: %s", interface.name, err)
raise HostNetworkError() from err raise HostNetworkError() from err
# Create new configuration and activate interface # Create new configuration and activate interface
@ -107,7 +107,9 @@ class NetworkManager(CoreSysAttributes):
settings, inet.object_path settings, inet.object_path
) )
except DBusError as err: except DBusError as err:
_LOGGER.error("Can't create config and activate %s", interface.name) _LOGGER.error(
"Can't create config and activate %s: %s", interface.name, err
)
raise HostNetworkError() from err raise HostNetworkError() from err
# Remove config from interface # Remove config from interface
@ -115,7 +117,7 @@ class NetworkManager(CoreSysAttributes):
try: try:
await inet.settings.delete() await inet.settings.delete()
except DBusError as err: except DBusError as err:
_LOGGER.error("Can't remove %s", interface.name) _LOGGER.error("Can't disable interface %s: %s", interface.name, err)
raise HostNetworkError() from err raise HostNetworkError() from err
# Create new interface (like vlan) # Create new interface (like vlan)
@ -125,7 +127,7 @@ class NetworkManager(CoreSysAttributes):
try: try:
await self.sys_dbus.network.settings.add_connection(settings) await self.sys_dbus.network.settings.add_connection(settings)
except DBusError as err: except DBusError as err:
_LOGGER.error("Can't create new interface") _LOGGER.error("Can't create new interface: %s", err)
raise HostNetworkError() from err raise HostNetworkError() from err
else: else:
_LOGGER.warning("Requested Network interface update is not possible") _LOGGER.warning("Requested Network interface update is not possible")
@ -145,10 +147,8 @@ class NetworkManager(CoreSysAttributes):
try: try:
await inet.wireless.request_scan() await inet.wireless.request_scan()
except DBusProgramError as err: except DBusProgramError as err:
if ( _LOGGER.debug("Can't request a new scan: %s", err)
"GDBus.Error:org.freedesktop.NetworkManager.Device.NotAllowed" except DBusError as err:
not in str(err)
):
raise HostNetworkError() from err raise HostNetworkError() from err
else: else:
await asyncio.sleep(5) await asyncio.sleep(5)