Martin Peřina has uploaded a new change for review. Change subject: core: Replace oVirt logger with slf4j in bll/network ......................................................................
core: Replace oVirt logger with slf4j in bll/network Replaces oVirt logger with slf4j in bll/network package. Stacktraces are logged only to debug for exceptions with clear custom error message. Change-Id: I9af76a3f79de2677060eb1dc36420f6be6433670 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolManagerRanges.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolPerDc.java 6 files changed, 37 insertions(+), 36 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/34344/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java index 9f6967b..655e845 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/NetworkConfigurator.java @@ -32,10 +32,10 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.utils.NetworkUtils; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class NetworkConfigurator { @@ -43,7 +43,7 @@ private static final String MANAGEMENET_NETWORK_CONFIG_ERR = "Failed to configure management network"; private static final String NETWORK_CONFIG_LOG_ERR = "Failed to configure management network: {0}"; private static final long POLLING_BREAK_IN_MILLIS = 500; - private static final Log log = LogFactory.getLog(NetworkConfigurator.class); + private static final Logger log = LoggerFactory.getLogger(NetworkConfigurator.class); private final VDS host; private CommandContext commandContext; @@ -60,14 +60,14 @@ } if (managementNetwork.equals(host.getActiveNic())) { - log.infoFormat("The management network {0} is already configured on host {1}", + log.info("The management network '{}' is already configured on host '{}'", managementNetwork, host.getName()); return; } if (!FeatureSupported.setupManagementNetwork(host.getVdsGroupCompatibilityVersion())) { - log.warnFormat("Host {0}'s cluster does not support normalize management network feature", host.getName()); + log.warn("Cluster of host '{}' does not support normalize management network feature", host.getName()); return; } @@ -113,7 +113,7 @@ / Config.<Integer> getValue(ConfigValues.SetupNetworksPollingTimeout); for (int i = 0; i < checks; i++) { if (pollVds()) { - log.infoFormat("Engine managed to communicate with VDSM agent on host {0}", + log.info("Engine managed to communicate with VDSM agent on host '{}' ('{}')", host.getName(), host.getId()); return true; @@ -155,7 +155,7 @@ private VdsNetworkInterface findNicToSetupManagementNetwork() { if (StringUtils.isEmpty(host.getActiveNic())) { - log.warnFormat("No interface was reported as lastClientInterface by host {0} capabilities. " + log.warn("No interface was reported as lastClientInterface by host '{}' capabilities. " + "There will be no attempt to create the management network on the host.", host.getName()); return null; } @@ -163,7 +163,7 @@ VdsNetworkInterface nic = Entities.entitiesByName(host.getInterfaces()).get(host.getActiveNic()); if (nic == null) { - log.warnFormat("The lastClientInterface {0} of host {1} is not a valid interface for the mangement network." + log.warn("The lastClientInterface '{}' of host '{}' is not a valid interface for the management network." + " If the interface is a bridge, it should be torn-down manually.", host.getActiveNic(), host.getName()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java index d05e1e2..c2965c7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/VmInterfaceManager.java @@ -31,17 +31,17 @@ import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao; import org.ovirt.engine.core.dao.network.VmNetworkStatisticsDao; import org.ovirt.engine.core.dao.network.VmNicDao; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Helper class to use for adding/removing {@link VmNic}s. */ public class VmInterfaceManager { - private Log log = LogFactory.getLog(getClass()); + private Logger log = LoggerFactory.getLogger(getClass()); private MacPoolManagerStrategy macPool; public VmInterfaceManager() { @@ -103,8 +103,8 @@ public Void runInTransaction() { AuditLogableBase logable = createAuditLog(iface); log(logable, AuditLogType.MAC_ADDRESS_IS_IN_USE); - log.warnFormat("Network Interface {0} has MAC address {1} which is in use, " + - "therefore the action for VM {2} failed.", iface.getName(), iface.getMacAddress(), + log.warn("Network Interface '{}' has MAC address '{}' which is in use, " + + "therefore the action for VM '{}' failed.", iface.getName(), iface.getMacAddress(), iface.getVmId()); return null; } @@ -117,8 +117,8 @@ public Void runInTransaction() { AuditLogableBase logable = createAuditLog(iface); log(logable, AuditLogType.MAC_ADDRESS_IS_IN_USE_UNPLUG); - log.warnFormat("Network Interface {0} has MAC address {1} which is in use, " + - "therefore it is being unplugged from VM {2}.", iface.getName(), iface.getMacAddress(), + log.warn("Network Interface '{}' has MAC address '{}' which is in use, " + + "therefore it is being unplugged from VM '{}'.", iface.getName(), iface.getMacAddress(), iface.getVmId()); return null; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java index dae2aaa..5ba41e1 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksCommand.java @@ -30,10 +30,10 @@ import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.common.vdscommands.VDSReturnValue; import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.transaction.TransactionMethod; import org.ovirt.engine.core.utils.transaction.TransactionSupport; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @NonTransactiveCommandAttribute public class SetupNetworksCommand<T extends SetupNetworksParameters> extends VdsCommand<T> { @@ -46,7 +46,7 @@ private static final long POLLING_BREAK = 500; private static final List<VDSStatus> SUPPORTED_HOST_STATUSES = Arrays.asList(VDSStatus.Maintenance, VDSStatus.Up, VDSStatus.NonOperational); - private static final Log log = LogFactory.getLog(SetupNetworksCommand.class); + private static final Logger log = LoggerFactory.getLogger(SetupNetworksCommand.class); private SetupNetworksHelper helper; public SetupNetworksCommand(T parameters) { @@ -99,7 +99,7 @@ updateModifiedInterfaces(); } - log.infoFormat("No changes were detected in setup networks for host {0} (ID: {1})", + log.info("No changes were detected in setup networks for host '{}' (ID '{}')", getVdsName(), getVdsId()); @@ -147,7 +147,7 @@ } } } catch (TimeoutException e) { - log.debugFormat("Setup networks command timed out for {0} seconds", timeout); + log.debug("Setup networks command timed out for {} seconds", timeout); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java index f5ca097..4fb36ae 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/host/SetupNetworksHelper.java @@ -31,12 +31,12 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.network.NetworkQoSDao; import org.ovirt.engine.core.utils.NetworkUtils; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class SetupNetworksHelper { protected static final String VIOLATING_ENTITIES_LIST_FORMAT = "${0}_LIST {1}"; - private static final Log log = LogFactory.getLog(SetupNetworksHelper.class); + private static final Logger log = LoggerFactory.getLogger(SetupNetworksHelper.class); private SetupNetworksParameters params; private VDS vds; private Map<VdcBllMessages, List<String>> violations = new HashMap<VdcBllMessages, List<String>>(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolManagerRanges.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolManagerRanges.java index 5211384..ecdf5eb 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolManagerRanges.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolManagerRanges.java @@ -13,12 +13,12 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.utils.MacAddressRangeUtils; import org.ovirt.engine.core.utils.lock.AutoCloseableLock; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MacPoolManagerRanges implements MacPoolManagerStrategy { - private static final Log log = LogFactory.getLog(MacPoolManagerRanges.class); + private static final Logger log = LoggerFactory.getLogger(MacPoolManagerRanges.class); private final ReentrantReadWriteLock lockObj = new ReentrantReadWriteLock(); private final boolean allowDuplicates; @@ -35,18 +35,19 @@ public void initialize() { try (AutoCloseableLock l = new AutoCloseableLock(lockObj.writeLock())) { if (initialized) { - log.error("Trying to initialized " + getClass().getName() + " multiple times."); + log.error("Trying to initialize {} multiple times.", getClass().getName()); return; } - log.infoFormat("Start initializing " + getClass().getSimpleName()); + log.info("Start initializing {}", getClass().getSimpleName()); this.macsStorage = createMacsStorage(rangesBoundaries); initialized = true; - log.infoFormat("Finished initializing. Available MACs in pool: {0}", macsStorage.getAvailableMacsCount()); + log.info("Finished initializing. Available MACs in pool: {}", macsStorage.getAvailableMacsCount()); } catch (Exception ex) { - log.errorFormat("Error in initializing MAC Addresses pool manager.", ex); + log.error("Error in initializing MAC Addresses pool manager: {}", ex.getMessage()); + log.debug("Exception", ex); } } @@ -98,7 +99,7 @@ try (AutoCloseableLock l = new AutoCloseableLock(lockObj.readLock())) { checkIfInitialized(); int availableMacsSize = macsStorage.getAvailableMacsCount(); - log.debugFormat("Number of available Mac addresses = {1}", availableMacsSize); + log.debug("Number of available Mac addresses = {}", availableMacsSize); return availableMacsSize; } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolPerDc.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolPerDc.java index 10e9d6d..3cd4ea4 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolPerDc.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/network/macpoolmanager/MacPoolPerDc.java @@ -16,8 +16,8 @@ import org.ovirt.engine.core.utils.DisjointRanges; import org.ovirt.engine.core.utils.MacAddressRangeUtils; import org.ovirt.engine.core.utils.lock.AutoCloseableLock; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MacPoolPerDc { @@ -27,7 +27,7 @@ static final String CANNOT_REMOVE_POOL_EXCEPTION_MESSAGE = "Cannot remove pool which is still in use."; static final String POOL_TO_BE_REMOVED_DOES_NOT_EXIST_EXCEPTION_MESSAGE = "Trying to removed pool which does not exist."; - private static final Log log = LogFactory.getLog(MacPoolPerDc.class); + private static final Logger log = LoggerFactory.getLogger(MacPoolPerDc.class); private final Map<Guid, MacPoolManagerStrategy> macPools = new HashMap<>(); private final ReentrantReadWriteLock lockObj = new ReentrantReadWriteLock(); @@ -48,9 +48,9 @@ initializeMacPool(macPool); } initialized = true; - log.info("successfully initialized"); + log.info("Successfully initialized"); } catch(RuntimeException e) { - log.error("not initialized."); + log.error("Error initializing: {}", e.getMessage()); throw e; } } -- To view, visit http://gerrit.ovirt.org/34344 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9af76a3f79de2677060eb1dc36420f6be6433670 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
