Yair Zaslavsky has uploaded a new change for review. Change subject: aaa: Engine should start even if exception occured in load of legacy provider ......................................................................
aaa: Engine should start even if exception occured in load of legacy provider Change-Id: I6ba595253c2569cf581e690b68348e6ae1c804b1 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java 1 file changed, 30 insertions(+), 25 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/29879/1 diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java index f5ab28d..a07dc2b 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java @@ -167,32 +167,37 @@ for (String domain : Config.<String> getValue(ConfigValues.DomainName).split("[,]", 0)) { domain = domain.trim(); if (!domain.isEmpty()) { - Properties authConfig = new Properties(); - authConfig.put(Base.ConfigKeys.NAME, String.format("builtin-authn-%1$s", domain)); - authConfig.put(Base.ConfigKeys.PROVIDES, Authn.class.getName()); - authConfig.put(Base.ConfigKeys.ENABLED, "true"); - authConfig.put(Base.ConfigKeys.BINDINGS_METHOD, Base.ConfigBindingsMethods.JBOSSMODULE); - authConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_MODULE, "org.ovirt.engine.extensions.builtin"); - authConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_CLASS, - "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapAuthn"); - authConfig.put("ovirt.engine.aaa.authn.profile.name", domain); - authConfig.put("ovirt.engine.aaa.authn.authz.plugin", domain); - authConfig.put("config.change.password.url", blankIfNull(passwordChangeUrlPerDomain.get(domain))); - authConfig.put("config.change.password.msg", blankIfNull(passwordChangeMsgPerDomain.get(domain))); - attachConfigValuesFromDb(authConfig, domain); - load(authConfig); + try { + Properties authConfig = new Properties(); + authConfig.put(Base.ConfigKeys.NAME, String.format("builtin-authn-%1$s", domain)); + authConfig.put(Base.ConfigKeys.PROVIDES, Authn.class.getName()); + authConfig.put(Base.ConfigKeys.ENABLED, "true"); + authConfig.put(Base.ConfigKeys.BINDINGS_METHOD, Base.ConfigBindingsMethods.JBOSSMODULE); + authConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_MODULE, "org.ovirt.engine.extensions.builtin"); + authConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_CLASS, + "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapAuthn"); + authConfig.put("ovirt.engine.aaa.authn.profile.name", domain); + authConfig.put("ovirt.engine.aaa.authn.authz.plugin", domain); + authConfig.put("config.change.password.url", blankIfNull(passwordChangeUrlPerDomain.get(domain))); + authConfig.put("config.change.password.msg", blankIfNull(passwordChangeMsgPerDomain.get(domain))); + attachConfigValuesFromDb(authConfig, domain); + load(authConfig); - Properties dirConfig = new Properties(); - dirConfig.put(Base.ConfigKeys.NAME, domain); - dirConfig.put(Base.ConfigKeys.PROVIDES, Authz.class.getName()); - dirConfig.put(Base.ConfigKeys.BINDINGS_METHOD, Base.ConfigBindingsMethods.JBOSSMODULE); - dirConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_MODULE, "org.ovirt.engine.extensions.builtin"); - dirConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_CLASS, - "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapAuthz"); - dirConfig.put("config.query.filter.size", - Config.getValue(ConfigValues.MaxLDAPQueryPartsNumber).toString()); - attachConfigValuesFromDb(dirConfig, domain); - load(dirConfig); + Properties dirConfig = new Properties(); + dirConfig.put(Base.ConfigKeys.NAME, domain); + dirConfig.put(Base.ConfigKeys.PROVIDES, Authz.class.getName()); + dirConfig.put(Base.ConfigKeys.BINDINGS_METHOD, Base.ConfigBindingsMethods.JBOSSMODULE); + dirConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_MODULE, "org.ovirt.engine.extensions.builtin"); + dirConfig.put(Base.ConfigKeys.BINDINGS_JBOSSMODULE_CLASS, + "org.ovirt.engine.extensions.aaa.builtin.kerberosldap.KerberosLdapAuthz"); + dirConfig.put("config.query.filter.size", + Config.getValue(ConfigValues.MaxLDAPQueryPartsNumber).toString()); + attachConfigValuesFromDb(dirConfig, domain); + load(dirConfig); + } catch (Exception ex) { + log.error("An error has occurred while initializaing a kerberos/ldap extension. Exception message is: {}", ex.getMessage()); + log.debug("", ex); + } } } } -- To view, visit http://gerrit.ovirt.org/29879 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6ba595253c2569cf581e690b68348e6ae1c804b1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
