Martin Peřina has uploaded a new change for review. Change subject: core: Replace oVirt logger with slf4j in bll/XXX ......................................................................
core: Replace oVirt logger with slf4j in bll/XXX Replaces oVirt logger with slf4j in following bll subpackages: dwh, eventqueue, job, lock, lsm, memory, pm, provider, quota and snapshots. Change-Id: I564678b8226542a4900450f8a0e5aa0c7249df70 Bug-Url: https://bugzilla.redhat.com/1109871 Signed-off-by: Martin Perina <mper...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/dwh/DwhHeartBeat.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/eventqueue/EventQueueMonitor.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ExternalTrustStoreInitializer.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java 11 files changed, 82 insertions(+), 79 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/25/34325/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/dwh/DwhHeartBeat.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/dwh/DwhHeartBeat.java index d15fda6..f9e83ff 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/dwh/DwhHeartBeat.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/dwh/DwhHeartBeat.java @@ -8,10 +8,10 @@ import org.ovirt.engine.core.common.config.Config; import org.ovirt.engine.core.common.config.ConfigValues; import org.ovirt.engine.core.dal.dbbroker.DbFacade; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.timer.OnTimerMethodAnnotation; import org.ovirt.engine.core.utils.timer.SchedulerUtilQuartzImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Job notifies DWH, that engine is up and running @@ -25,7 +25,7 @@ /** * Logger instance */ - private static final Log log = LogFactory.getLog(DwhHeartBeat.class); + private static final Logger log = LoggerFactory.getLogger(DwhHeartBeat.class); /** * Instance of heartBeat variable diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/eventqueue/EventQueueMonitor.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/eventqueue/EventQueueMonitor.java index f7ad411..84be2ad 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/eventqueue/EventQueueMonitor.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/eventqueue/EventQueueMonitor.java @@ -23,9 +23,9 @@ import org.ovirt.engine.core.common.eventqueue.EventType; import org.ovirt.engine.core.common.utils.Pair; import org.ovirt.engine.core.compat.Guid; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @Singleton(name = "EventQueue") @ConcurrencyManagement(ConcurrencyManagementType.BEAN) @@ -33,7 +33,7 @@ @Local(EventQueue.class) public class EventQueueMonitor implements EventQueue { - private static final Log log = LogFactory.getLog(EventQueueMonitor.class); + private static final Logger log = LoggerFactory.getLogger(EventQueueMonitor.class); private static final ConcurrentMap<Guid, ReentrantLock> poolsLockMap = new ConcurrentHashMap<Guid, ReentrantLock>(); private static final Map<Guid, LinkedList<Pair<Event, FutureTask<EventResult>>>> poolsEventsMap = @@ -55,12 +55,12 @@ // CancellationException is normal here, as we cancel future tasks when reconstruct is running // This cancellation is also being reported to the log // Currently ignoring that exception, writing a debug message, in case other scenario of canceling an exception will be introduced - log.debugFormat("Failed to submit event using submitEventSync (the event was cancelled)- pool {0} , exception {1}", - event.getStoragePoolId(), - e); + log.debug("Failed to submit event using submitEventSync (the event was cancelled)- pool '{}'", + event.getStoragePoolId()); + log.debug("Exception", e); } catch (Exception e) { - log.errorFormat("Failed at submitEventSync, for pool {0} with exception {1}", - event.getStoragePoolId(), e); + log.error("Failed at submitEventSync, for pool '{}'", event.getStoragePoolId()); + log.error("Exception", e); } } return null; @@ -82,7 +82,7 @@ || event.getEventType() == EventType.DOMAINFAILOVER) { task = addTaskToQueue(event, callable, storagePoolId, isEventShouldBeFirst(event)); } else { - log.debugFormat("Current event was skipped because of recovery is running now for pool {0}, event {1}", + log.debug("Current event was skipped because of recovery is running now for pool '{}', event '{}'", storagePoolId, event); } break; @@ -93,7 +93,7 @@ || event.getEventType() == EventType.VDSCLEARCACHE) { task = addTaskToQueue(event, callable, storagePoolId, isEventShouldBeFirst(event)); } else { - log.debugFormat("Current event was skipped because of reconstruct is running now for pool {0}, event {1}", + log.debug("Current event was skipped because of reconstruct is running now for pool '{}', event '{}'", storagePoolId, event); } break; @@ -180,7 +180,7 @@ } else { poolCurrentEventMap.remove(storagePoolId); poolsEventsMap.remove(storagePoolId); - log.debugFormat("All task for event query were executed pool {0}", storagePoolId); + log.debug("All task for event query were executed pool '{}'", storagePoolId); break; } } finally { @@ -191,7 +191,7 @@ if (futureResult.get() == null) { EventResult result = pair.getSecond().get(); if (result != null && result.getEventType() == EventType.RECONSTRUCT) { - log.infoFormat("Finished reconstruct for pool {0}. Clearing event queue", storagePoolId); + log.info("Finished reconstruct for pool '{}'. Clearing event queue", storagePoolId); lock.lock(); try { LinkedList<Pair<Event, FutureTask<EventResult>>> queue = @@ -203,7 +203,7 @@ ((eventType == EventType.RECOVERY || eventType == EventType.DOMAINFAILOVER || eventType == EventType.VDSCLEARCACHE) && !result.isSuccess())) { queue.add(task); } else { - log.infoFormat("The following operation {0} was cancelled, because of reconstruct was run before", + log.info("The following operation '{}' was cancelled, because of reconstruct was run before", task.getFirst()); task.getSecond().cancel(true); } @@ -221,8 +221,8 @@ } } } catch (Exception e) { - log.errorFormat("Exception during process of events for pool {0}, error is {1}", - storagePoolId, e.getMessage()); + log.error("Exception during process of events for pool '{}'", storagePoolId); + log.error("Exception", e); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java index 6e92bea..08b22d7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/JobRepositoryImpl.java @@ -72,7 +72,8 @@ jobDao.updateJobLastUpdateTime(step.getJobId(), new Date()); stepDao.update(step); } catch (Exception e) { - log.errorFormat("Failed to update step {0}, {1}.", step.getId(), step.getStepName(), e); + log.error("Failed to update step '{}', '{}'.", step.getId(), step.getStepName()); + log.error("Exception", e); } return null; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java index a2a4612..73151b3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lock/InMemoryLockManager.java @@ -26,10 +26,10 @@ import javax.management.ObjectName; import org.ovirt.engine.core.common.utils.Pair; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.lock.EngineLock; import org.ovirt.engine.core.utils.lock.LockManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The following class an implementation of internal locking mechanism @@ -51,7 +51,7 @@ private MBeanServer platformMBeanServer; private ObjectName objectName = null; - private static final Log log = LogFactory.getLog(InMemoryLockManager.class); + private static final Logger log = LoggerFactory.getLogger(InMemoryLockManager.class); @PostConstruct public void registerInJMX() { @@ -75,7 +75,7 @@ @Override public Pair<Boolean, Set<String>> acquireLock(EngineLock lock) { - log.debugFormat("Before acquiring lock {0}", lock); + log.debug("Before acquiring lock '{}'", lock); globalLock.lock(); try { return acquireLockInternal(lock); @@ -86,12 +86,12 @@ @Override public void acquireLockWait(EngineLock lock) { - log.debugFormat("Before acquiring and wait lock {0}", lock); + log.debug("Before acquiring and wait lock '{}'", lock); validateLockForAcquireAndWait(lock); globalLock.lock(); try { while (!acquireLockInternal(lock).getFirst()) { - log.infoFormat("Failed to acquire lock and wait lock {0}", lock); + log.info("Failed to acquire lock and wait lock '{}'", lock); releasedLock.await(); } } catch (InterruptedException e) { @@ -103,14 +103,14 @@ private void validateLockForAcquireAndWait(EngineLock lock) { if (lock.getSharedLocks() != null && lock.getExclusiveLocks().size() > 1) { - log.errorFormat("Trying to acquire or wait on shared or more than one exclussive locks {0}", lock); + log.error("Trying to acquire or wait on shared or more than one exclussive locks '{}'", lock); throw new IllegalArgumentException("Trying to acquire or wait on shared or more than one exclussive locks"); } } @Override public void releaseLock(EngineLock lock) { - log.debugFormat("Before releasing a lock {0}", lock); + log.debug("Before releasing a lock '{}'", lock); globalLock.lock(); try { if (lock.getSharedLocks() != null) { @@ -143,13 +143,14 @@ @Override public boolean releaseLock(String lockId) { - log.warnFormat("The following lock is going to be released via external call, lockId {0}, error message can be left for shared lock", + log.warn("The following lock is going to be released via external call, lockId '{}', error message can be" + + " left for shared lock", lockId); globalLock.lock(); try { InternalLockView lock = locks.get(lockId); if (lock == null) { - log.warnFormat("Lock with id {0} does not exist and can not be released via external call", lockId); + log.warn("Lock with id '{}' does not exist and can not be released via external call", lockId); return false; } if (lock.getExclusive()) { @@ -161,7 +162,7 @@ } finally { globalLock.unlock(); } - log.warnFormat("Lock {0} was released via external call", lockId); + log.warn("Lock '{}' was released via external call", lockId); return true; } @@ -207,7 +208,7 @@ Pair<Boolean, Set<String>> result = insertSharedLock(buildHashMapKey(entry), entry.getValue().getSecond(), checkOnly); if (!result.getFirst()) { - log.debugFormat("Failed to acquire lock. Shared lock is taken for key :{0} , value: {1}", + log.debug("Failed to acquire lock. Shared lock is taken for key '{}', value '{}'", entry.getKey(), entry.getValue().getFirst()); return result; @@ -219,7 +220,7 @@ Pair<Boolean, Set<String>> result = insertExclusiveLock(buildHashMapKey(entry), entry.getValue().getSecond(), checkOnly); if (!result.getFirst()) { - log.debugFormat("Failed to acquire lock. Exclusive lock is taken for key: {0} , value: {1}", + log.debug("Failed to acquire lock. Exclusive lock is taken for key '{}', value '{}'", entry.getKey(), entry.getValue().getFirst()); return result; @@ -228,7 +229,7 @@ } checkOnly = false; } - log.debugFormat("Successed acquiring lock {0} succeeded ", lock); + log.debug("Success acquiring lock '{}' succeeded ", lock); return LOCK_INSERT_SUCCESS_RESULT; } @@ -275,11 +276,11 @@ InternalLockView lock = locks.get(key); if (lock != null && lock.getExclusive()) { locks.remove(key); - log.debugFormat("The exclusive lock for key {0} is released and lock is removed from map", key); + log.debug("The exclusive lock for key '{}' is released and lock is removed from map", key); } else if (lock == null) { - log.warnFormat("Trying to release exclusive lock which does not exist, lock key: {0}", key); + log.warn("Trying to release exclusive lock which does not exist, lock key: '{}'", key); } else { - log.warnFormat("Trying to release exclusive lock but lock is not exclusive. lock key: {0}", key); + log.warn("Trying to release exclusive lock but lock is not exclusive. lock key: '{}'", key); } } @@ -288,18 +289,18 @@ if (lock != null) { if (lock.getCount() > 0) { lock.decreaseCount(); - log.debugFormat("The shared lock for key {0} is released.", key); + log.debug("The shared lock for key '{}' is released.", key); if (lock.getCount() == 0) { locks.remove(key); - log.debugFormat("The shared lock for key {0} is removed from map", key); + log.debug("The shared lock for key '{}' is removed from map", key); } else { lock.removeMessage(message); } } else { - log.warnFormat("Trying to decrease a shared lock for key: {0} , but shared index is 0", key); + log.warn("Trying to decrease a shared lock for key: '{}' , but shared index is 0", key); } } else { - log.warnFormat("Trying to release a shared lock for key: {0} , but lock does not exist", key); + log.warn("Trying to release a shared lock for key: '{}' , but lock does not exist", key); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java index cea2992..7c7e3c5 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDisksTaskHandler.java @@ -15,15 +15,15 @@ import org.ovirt.engine.core.common.errors.VdcBllErrors; import org.ovirt.engine.core.common.businessentities.ImageStatus; import org.ovirt.engine.core.compat.TransactionScopeOption; -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 LiveMigrateDisksTaskHandler implements SPMAsyncTaskHandler { private final TaskHandlerCommand<? extends LiveMigrateVmDisksParameters> enclosingCommand; - private static final Log log = LogFactory.getLog(LiveMigrateDisksTaskHandler.class); + private static final Logger log = LoggerFactory.getLogger(LiveMigrateDisksTaskHandler.class); public LiveMigrateDisksTaskHandler(TaskHandlerCommand<? extends LiveMigrateVmDisksParameters> enclosingCommand) { this.enclosingCommand = enclosingCommand; @@ -58,7 +58,7 @@ if (!parameters.getTaskGroupSuccess()) { ExecutionHandler.endTaskJob(commandContext.getExecutionContext(), false); - log.errorFormat("Failed LiveMigrateDisk (Disk {0} , VM {1})", + log.error("Failed LiveMigrateDisk (Disk '{}' , VM '{}')", parameters.getImageGroupID(), parameters.getVmId()); } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java index ca153f6..34d4870 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/memory/MemoryImageRemover.java @@ -19,11 +19,11 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dao.DiskDao; import org.ovirt.engine.core.utils.GuidUtils; -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 abstract class MemoryImageRemover { - private static final Log log = LogFactory.getLog(MemoryImageRemover.class); + private static final Logger log = LoggerFactory.getLogger(MemoryImageRemover.class); private static final int NUM_OF_UUIDS_IN_MEMORY_STATE = 6; protected final TaskHandlerCommand<?> enclosingCommand; @@ -83,7 +83,7 @@ List<Guid> guids = GuidUtils.getGuidListFromString(memVols); if (guids.size() != NUM_OF_UUIDS_IN_MEMORY_STATE) { - log.warnFormat("Cannot remove memory volumes, invalid format: {0}", memVols); + log.warn("Cannot remove memory volumes, invalid format '{}'", memVols); return true; } @@ -132,7 +132,7 @@ else { boolean imageDoesNotExist = vdsRetValue.getVdsError().getCode() == VdcBllErrors.ImageDoesNotExistInDomainError; if (!imageDoesNotExist) { - log.errorFormat("Could not remove memory image: {0}", parameters); + log.error("Could not remove memory image '{}'", parameters); } enclosingCommand.deleteAsyncTaskPlaceHolder(taskKey); // otherwise, if the command failed because the image does not exist, diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java index a084d54..b6da9ec 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/pm/PmHealthCheckManager.java @@ -25,11 +25,11 @@ import org.ovirt.engine.core.utils.ThreadUtils; import org.ovirt.engine.core.utils.linq.LinqUtils; import org.ovirt.engine.core.utils.linq.Predicate; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.threadpool.ThreadPoolUtil; import org.ovirt.engine.core.utils.timer.OnTimerMethodAnnotation; import org.ovirt.engine.core.utils.timer.SchedulerUtilQuartzImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Responsible for checking PM enabled hosts by sending a status command to each host configured PM agent cards and @@ -37,7 +37,7 @@ */ public class PmHealthCheckManager { - private static final Log log = LogFactory.getLog(PmHealthCheckManager.class); + private static final Logger log = LoggerFactory.getLogger(PmHealthCheckManager.class); private static final PmHealthCheckManager instance = new PmHealthCheckManager(); private boolean active = false; @@ -50,7 +50,7 @@ */ public void initialize() { if(Config.<Boolean>getValue(ConfigValues.PMHealthCheckEnabled)) { - log.info("Start initializing " + getClass().getSimpleName()); + log.info("Start initializing {}", getClass().getSimpleName()); Integer pmHealthCheckInterval = Config.<Integer> getValue(ConfigValues.PMHealthCheckIntervalInSec); SchedulerUtilQuartzImpl.getInstance().scheduleAFixedDelayJob(this, "pmHealthCheck", @@ -59,7 +59,7 @@ pmHealthCheckInterval, pmHealthCheckInterval, TimeUnit.SECONDS); - log.info("Finished initializing " + getClass().getSimpleName()); + log.info("Finished initializing {}", getClass().getSimpleName()); } } @@ -169,11 +169,11 @@ if (restartVdsCommand.isPmReportsStatusDown()) { VdcReturnValueBase retValue = Backend.getInstance().runInternalAction(VdcActionType.RestartVds, restartVdsCommand.getParameters()); if (retValue!= null && retValue.getSucceeded()) { - log.infoFormat("Host {0} was started successfully by PM Health Check Manager", + log.info("Host '{}' was started successfully by PM Health Check Manager", host.getName()); } else { - log.infoFormat("PM Health Check Manager failed to start Host {0}", host.getName()); + log.info("PM Health Check Manager failed to start Host '{}'", host.getName()); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ExternalTrustStoreInitializer.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ExternalTrustStoreInitializer.java index 6ca5183..a4cf7f8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ExternalTrustStoreInitializer.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ExternalTrustStoreInitializer.java @@ -8,12 +8,12 @@ import java.security.KeyStore; import org.ovirt.engine.core.utils.EngineLocalConfig; -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 ExternalTrustStoreInitializer { - private static final Log log = LogFactory.getLog(ExternalTrustStoreInitializer.class); + private static final Logger log = LoggerFactory.getLogger(ExternalTrustStoreInitializer.class); private static String getTrustStorePath() { File varDir = EngineLocalConfig.getInstance().getVarDir(); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java index adb4c9b..309a2e0 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/quota/QuotaManager.java @@ -24,14 +24,14 @@ import org.ovirt.engine.core.dal.dbbroker.DbFacade; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.dao.QuotaDAO; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.timer.OnTimerMethodAnnotation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class QuotaManager { private static final QuotaManager INSTANCE = new QuotaManager(); private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock(); - private final Log log = LogFactory.getLog(QuotaManager.class); + private final Logger log = LoggerFactory.getLogger(QuotaManager.class); private HashMap<Guid, Map<Guid, Quota>> storagePoolQuotaMap = new HashMap<Guid, Map<Guid, Quota>>(); private final QuotaManagerAuditLogger quotaManagerAuditLogger = new QuotaManagerAuditLogger(); @@ -207,7 +207,7 @@ Quota quota = quotaMap.get(entry.getKey()); double value = entry.getValue(); if (value < 0) { - log.errorFormat("Quota id {0} cached storage size is negative, removing from cache", entry.getKey()); + log.error("Quota id '{}' cached storage size is negative, removing from cache", entry.getKey()); quotaMap.remove(entry.getKey()); continue; } @@ -220,7 +220,7 @@ double value = quotaStorageEntry.getValue() .get(quotaStorage.getStorageId()); if (value < 0) { - log.errorFormat("Quota id {0} cached storage size is negative, removing from cache", + log.error("Quota id '{}' cached storage size is negative, removing from cache", quotaStorageEntry.getKey()); quotaMap.remove(quotaStorageEntry.getKey()); continue; @@ -707,7 +707,7 @@ : AuditLogType.MISSING_QUOTA_CLUSTER_PARAMETERS_PERMISSIVE_MODE); } - log.errorFormat("No Quota id passed from command: {0}", parameters.getAuditLogable().getClass().getName()); + log.error("No Quota id passed from command '{}'", parameters.getAuditLogable().getClass().getName()); corruptedParameters.add(param); return false; } @@ -721,7 +721,7 @@ auditLogPair.setFirst(param.getParameterType() == QuotaConsumptionParameter.ParameterType.STORAGE ? AuditLogType.MISSING_QUOTA_STORAGE_PARAMETERS_PERMISSIVE_MODE : AuditLogType.MISSING_QUOTA_CLUSTER_PARAMETERS_PERMISSIVE_MODE); - log.errorFormat("The quota id {0} is not found in backend and DB.", param.getQuotaGuid().toString()); + log.error("The quota id '{}' is not found in backend and DB.", param.getQuotaGuid()); corruptedParameters.add(param); return false; } else { @@ -741,7 +741,7 @@ if (paramVds.getVdsGroupId() == null) { parameters.getCanDoActionMessages().add(VdcBllMessages.ACTION_TYPE_FAILED_QUOTA_IS_NOT_VALID.toString()); - log.errorFormat("Quota Vds parameters from command: {0} are missing vds group id", + log.error("Quota Vds parameters from command '{}' are missing vds group id", parameters.getAuditLogable().getClass().getName()); return false; } @@ -759,7 +759,7 @@ if (!vdsGroupInQuota) { parameters.getCanDoActionMessages().add(VdcBllMessages.ACTION_TYPE_FAILED_QUOTA_IS_NOT_VALID.toString()); - log.errorFormat("Quota Vds parameters from command: {0}. Vds group does not match quota", + log.error("Quota Vds parameters from command '{}'. Vds group does not match quota", parameters.getAuditLogable().getClass().getName()); return false; } @@ -774,7 +774,7 @@ if (paramStorage.getStorageDomainId() == null) { parameters.getCanDoActionMessages().add(VdcBllMessages.ACTION_TYPE_FAILED_QUOTA_IS_NOT_VALID.toString()); - log.errorFormat("Quota storage parameters from command: {0} are missing storage domain id", + log.error("Quota storage parameters from command '{}' are missing storage domain id", parameters.getAuditLogable().getClass().getName()); return false; } @@ -792,7 +792,7 @@ if (!storageDomainInQuota) { parameters.getCanDoActionMessages().add(VdcBllMessages.ACTION_TYPE_FAILED_NO_QUOTA_SET_FOR_DOMAIN.toString()); - log.errorFormat("Quota storage parameters from command: {0}. Storage domain does not match quota", + log.error("Quota storage parameters from command '{}'. Storage domain does not match quota", parameters.getAuditLogable().getClass().getName()); return false; } @@ -1082,7 +1082,7 @@ lock.writeLock().unlock(); } long timeEnd = System.currentTimeMillis(); - log.infoFormat("Quota Cache updated. ({0} msec)", timeEnd-timeStart); + log.info("Quota Cache updated. ({} msec)", timeEnd-timeStart); } public boolean isCacheUpdateNeeded() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java index 6199150..9caa149 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotVmConfigurationHelper.java @@ -18,12 +18,12 @@ import org.ovirt.engine.core.dao.SnapshotDao; import org.ovirt.engine.core.dao.VmDAO; import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao; -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 SnapshotVmConfigurationHelper { - private static final Log log = LogFactory.getLog(SnapshotVmConfigurationHelper.class); + private static final Logger log = LoggerFactory.getLogger(SnapshotVmConfigurationHelper.class); /** * Creates a VM by a specified OVF string. @@ -104,7 +104,7 @@ for (DiskImage fromConfigImg : vm.getImages()) { if (fromConfigImg.getDiskStorageType() == Disk.DiskStorageType.IMAGE && !imagesInDbMap.containsKey(fromConfigImg.getImageId())) { - log.debugFormat("Image {0} of Disk {1} cannot be found in database. This image will be returned as ILLEGAL from the query", + log.debug("Image '{}' of Disk '{}' cannot be found in database. This image will be returned as ILLEGAL from the query", fromConfigImg.getImageId(), fromConfigImg.getId()); fromConfigImg.setImageStatus(ImageStatus.ILLEGAL); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java index b856908..806041e 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/snapshots/SnapshotsManager.java @@ -49,17 +49,17 @@ import org.ovirt.engine.core.dao.VmStaticDAO; import org.ovirt.engine.core.dao.VmTemplateDAO; import org.ovirt.engine.core.dao.network.VmNetworkInterfaceDao; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; import org.ovirt.engine.core.utils.ovf.OvfManager; import org.ovirt.engine.core.utils.ovf.OvfReaderException; import org.ovirt.engine.core.utils.ovf.VMStaticOvfLogHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The {@link Snapshot} manager is used to easily add/update/remove snapshots. */ public class SnapshotsManager { - private final static Log log = LogFactory.getLog(SnapshotsManager.class); + private final static Logger log = LoggerFactory.getLogger(SnapshotsManager.class); /** * Save an active snapshot for the VM, without saving the configuration.<br> @@ -561,7 +561,8 @@ validateQuota(vm); return true; } catch (OvfReaderException e) { - log.errorFormat("Failed to update VM from the configuration: {0}).", configuration, e); + log.error("Failed to update VM from the configuration '{}'.", configuration); + log.error("Exception", e); return false; } } -- To view, visit http://gerrit.ovirt.org/34325 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I564678b8226542a4900450f8a0e5aa0c7249df70 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Martin Peřina <mper...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
