Martin Peřina has uploaded a new change for review. Change subject: core: Replace oVirt logger with slf4j in aaa ......................................................................
core: Replace oVirt logger with slf4j in aaa Replaces oVirt logger with slf4j in aaa module. Change-Id: Ic51dce32ddfd2453dbb0d143b8ca83ae76663b8b 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/aaa/DbUserCacheManager.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java 4 files changed, 38 insertions(+), 55 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/19/34219/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DbUserCacheManager.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DbUserCacheManager.java index 7e6d021..7aed7a7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DbUserCacheManager.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/DbUserCacheManager.java @@ -11,13 +11,13 @@ 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; public class DbUserCacheManager { - private static final Log log = LogFactory.getLog(DbUserCacheManager.class); + private static final Logger log = LoggerFactory.getLogger(DbUserCacheManager.class); private static final DbUserCacheManager _instance = new DbUserCacheManager(); private boolean initialized = false; private final Map<String, DbGroup> groupsMap = new HashMap<>(); @@ -31,7 +31,7 @@ public void init() { if (!initialized) { - log.info("Start initializing " + getClass().getSimpleName()); + log.info("Start initializing {}", getClass().getSimpleName()); int mRefreshRate = Config.<Integer> getValue(ConfigValues.UserRefreshRate); SchedulerUtilQuartzImpl.getInstance().scheduleAFixedDelayJob( @@ -44,7 +44,7 @@ TimeUnit.SECONDS ); initialized = true; - log.info("Finished initializing " + getClass().getSimpleName()); + log.info("Finished initializing {}", getClass().getSimpleName()); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java index eeef75e..2ce33cc 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/LoginBaseCommand.java @@ -38,12 +38,12 @@ import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector; import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogableBase; import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; -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; public abstract class LoginBaseCommand<T extends LoginUserParameters> extends CommandBase<T> { - protected static final Log log = LogFactory.getLog(LoginBaseCommand.class); + protected static final Logger log = LoggerFactory.getLogger(LoginBaseCommand.class); private static final Map<Integer, AuditLogType> auditLogMap = new HashMap<>(); private static final Map<Integer, VdcBllMessages> vdcBllMessagesMap = new HashMap<>(); @@ -136,8 +136,9 @@ validTo = fromExtension; } } catch (ParseException e) { - log.warn("Error parsing AuthRecord.VALID_TO . Default VALID_TO value will be set on session"); - log.debug("Exception is ", e); + log.warn("Error parsing AuthRecord.VALID_TO. Default VALID_TO value will be set on session: {}", + e.getMessage()); + log.debug("Exception", e); } } SessionDataContainer.getInstance().setHardLimit(engineSessionId, validTo); @@ -147,10 +148,8 @@ protected boolean isUserCanBeAuthenticated() { AuthenticationProfile profile = AuthenticationProfileRepository.getInstance().getProfile(getParameters().getProfileName()); if (profile == null) { - log.errorFormat( - "Can't login because authentication profile \"{1}\" doesn't exist.", - getParameters().getProfileName() - ); + log.error("Can't login because authentication profile '{}' doesn't exist.", + getParameters().getProfileName()); addCanDoActionMessage(VdcBllMessages.USER_FAILED_TO_AUTHENTICATE); return false; } @@ -170,28 +169,21 @@ // Verify that the login name and password have been provided: loginName = getParameters().getLoginName(); if (loginName == null) { - log.errorFormat( - "Can't login user because no login name has been provided." - ); + log.error("Can't login user because no login name has been provided."); addCanDoActionMessage(VdcBllMessages.USER_FAILED_TO_AUTHENTICATE); return false; } String password = getParameters().getPassword(); if (password == null) { - log.errorFormat( - "Can't login user \"{0}\" because no password has been provided.", - loginName - ); + log.error("Can't login user '{}' because no password has been provided.", loginName); return false; } if (!AuthzUtils.supportsPasswordAuthentication(authnExtension)) { - log.errorFormat( - "Can't login user \"{0}\" because the authentication profile \"{1}\" doesn't support password " - + - "authentication.", - loginName, profile.getName() - ); + log.error("Can't login user '{}' because the authentication profile '{}' doesn't support password" + + " authentication.", + loginName, + profile.getName()); addCanDoActionMessage(VdcBllMessages.USER_FAILED_TO_AUTHENTICATE); return false; } @@ -236,13 +228,10 @@ ExtMap principalRecord = AuthzUtils.fetchPrincipalRecord(profile.getAuthz(), authRecord); if (principalRecord == null) { - log.infoFormat( - "Can't login user \"{0}\" with authentication profile \"{1}\" because the user doesn't exist in the " - + - "directory.", + log.info("Can't login user '{}' with authentication profile '{}' because the user doesn't exist in the" + + " directory.", authRecord.<String> get(Authn.AuthRecord.PRINCIPAL), - profile.getName() - ); + profile.getName()); addCanDoActionMessage(VdcBllMessages.USER_MUST_EXIST_IN_DIRECTORY); AcctUtils.reportRecords( Acct.ReportReason.PRINCIPAL_NOT_FOUND, @@ -260,11 +249,9 @@ DbUser dbUser = DirectoryUtils.mapPrincipalRecordToDbUser(AuthzUtils.getName(profile.getAuthz()), principalRecord); if (!dbUser.isActive()) { dbUser.setActive(true); - log.info( - String.format("The user %1$s was reactivated as it was found in authz provider %2$s during login attempt.", + log.info("The user '{}' was reactivated as it was found in authz provider '{}' during login attempt.", dbUser.getLoginName(), - dbUser.getDomain()) - ); + dbUser.getDomain()); } getDbUserDAO().saveOrUpdate(dbUser); @@ -295,7 +282,7 @@ // This may be redundant in some use-cases, but looking forward to Single Sign On, // we will want this info boolean isAdmin = MultiLevelAdministrationHandler.isAdminUser(dbUser); - log.debugFormat("Checking if user {0} is an admin, result {1}", dbUser.getLoginName(), isAdmin); + log.debug("Checking if user '{}' is an admin, result {}", dbUser.getLoginName(), isAdmin); dbUser.setAdmin(isAdmin); setCurrentUser(dbUser); AcctUtils.reportRecords( @@ -319,9 +306,7 @@ @Override protected boolean isUserAuthorizedToRunAction() { - if (log.isDebugEnabled()) { - log.debug("IsUserAutorizedToRunAction: login - no permission check"); - } + log.debug("IsUserAutorizedToRunAction: login - no permission check"); return true; } @@ -382,8 +367,7 @@ int authResult = outputMap.<Integer>get(Authn.InvokeKeys.RESULT); if (authResult != Authn.AuthResult.SUCCESS) { - log.infoFormat( - "Can't login user \"{0}\" with authentication profile \"{1}\" because the authentication failed.", + log.info("Can't login user '{}' with authentication profile '{}' because the authentication failed.", user, getParameters().getProfileName()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java index 5102145..39261ed 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/SyncUsers.java @@ -14,12 +14,12 @@ import org.ovirt.engine.core.extensions.mgr.ExtensionProxy; import org.ovirt.engine.core.utils.collections.MultiValueMapUtils; import org.ovirt.engine.core.utils.extensionsmgr.EngineExtensionsManager; -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 SyncUsers { - private static final Log log = LogFactory.getLog(SyncUsers.class); + private static final Logger log = LoggerFactory.getLogger(SyncUsers.class); public static DbUser sync(DbUser dbUser) { List<DbUser> synchedUsers = sync(Arrays.asList(dbUser)); @@ -63,13 +63,13 @@ if (!activeUser.equals(dbUser)) { activeUser.setId(dbUser.getId()); activeUser.setAdmin(dbUser.isAdmin()); - log.infoFormat("Principal {0}::{1} synchronized", + log.info("Principal {}::{} synchronized", activeUser.getLoginName(), activeUser.getDomain()); usersToUpdate.add(activeUser); } } else { - log.infoFormat("Deactivating non existing principal {0}::{1}", + log.info("Deactivating non existing principal {}::{}", dbUser.getLoginName(), dbUser.getDomain()); dbUser.setActive(false); @@ -77,9 +77,9 @@ } } } catch (Exception ex) { - log.errorFormat("Error during user synchronization of extension {0}. Exception message is {1}", + log.error("Error during user synchronization of extension '{}': {}", authz, ex.getMessage()); - log.debug("", ex); + log.debug("Exception", ex); } } return usersToUpdate; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java index 406a51e..cc38f45 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/aaa/ValidateSessionQuery.java @@ -3,13 +3,14 @@ import org.ovirt.engine.core.bll.QueriesCommandBase; import org.ovirt.engine.core.common.businessentities.aaa.DbUser; import org.ovirt.engine.core.common.queries.VdcQueryParametersBase; -import org.ovirt.engine.core.utils.log.Log; -import org.ovirt.engine.core.utils.log.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /* * This query validates the session, returning the user which is logged in this session. */ public class ValidateSessionQuery<P extends VdcQueryParametersBase> extends QueriesCommandBase<P> { + private final static Logger log = LoggerFactory.getLogger(ValidateSessionQuery.class); public ValidateSessionQuery(P parameters) { super(parameters); @@ -24,7 +25,7 @@ private void validateSession(String sessionID) { getQueryReturnValue().setSucceeded(false); if (sessionID != null) { - log.debug("Input session ID is: " + sessionID); + log.debug("Input session ID is '{}'", sessionID); DbUser user = (DbUser) getSessionUser(sessionID); if (user != null) { log.debug("Found session user"); @@ -40,6 +41,4 @@ protected Object getSessionUser(String sessionID) { return SessionDataContainer.getInstance().getUser(sessionID, false); } - - private final static Log log = LogFactory.getLog(ValidateSessionQuery.class); } -- To view, visit http://gerrit.ovirt.org/34219 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic51dce32ddfd2453dbb0d143b8ca83ae76663b8b 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
