Yair Zaslavsky has uploaded a new change for review.
Change subject: aaa: ExtensionsManager should use slf4j for logging
......................................................................
aaa: ExtensionsManager should use slf4j for logging
Topic: AAA
Change-Id: I194a351677a38d814e987e63b405e43c415dea49
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M backend/manager/modules/extensions-manager/pom.xml
M
backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
M
backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
M
backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/extensionsmgr/EngineExtensionsManager.java
M
backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
6 files changed, 28 insertions(+), 37 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/28539/1
diff --git a/backend/manager/modules/extensions-manager/pom.xml
b/backend/manager/modules/extensions-manager/pom.xml
index b6714df..2f33ecd 100644
--- a/backend/manager/modules/extensions-manager/pom.xml
+++ b/backend/manager/modules/extensions-manager/pom.xml
@@ -22,20 +22,21 @@
<artifactId>ovirt-engine-extensions-api</artifactId>
<version>${org.ovirt.engine.api.ovirt-engine-extensions-api.version}</version>
</dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons-logging.version}</version>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.jboss.modules</groupId>
<artifactId>jboss-modules</artifactId>
<version>1.1.1.GA</version>
</dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ </dependency>
+
</dependencies>
+
<build>
<plugins>
diff --git
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
index 3af2c90..23b299e 100644
---
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
+++
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionProxy.java
@@ -1,10 +1,9 @@
package org.ovirt.engine.core.extensions.mgr;
-import org.apache.commons.logging.Log;
-
import org.ovirt.engine.api.extensions.Base;
import org.ovirt.engine.api.extensions.ExtMap;
import org.ovirt.engine.api.extensions.Extension;
+import org.slf4j.Logger;
public class ExtensionProxy implements Extension {
@@ -13,7 +12,7 @@
private final ExtMap context;
private void dumpMap(String prefix, ExtMap map) {
- Log logger = context.<Log>
get(ExtensionsManager.TRACE_LOG_CONTEXT_KEY);
+ Logger logger = context.<Logger>
get(ExtensionsManager.TRACE_LOG_CONTEXT_KEY);
if (logger.isDebugEnabled()) {
logger.debug(prefix + " BEGIN");
logger.debug(map.toString());
diff --git
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
index aef0c5e..adfca12 100644
---
a/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
+++
b/backend/manager/modules/extensions-manager/src/main/java/org/ovirt/engine/core/extensions/mgr/ExtensionsManager.java
@@ -14,8 +14,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.jboss.modules.Module;
import org.jboss.modules.ModuleIdentifier;
import org.jboss.modules.ModuleLoadException;
@@ -24,6 +22,9 @@
import org.ovirt.engine.api.extensions.ExtKey;
import org.ovirt.engine.api.extensions.ExtMap;
import org.ovirt.engine.api.extensions.Extension;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This class is responsible for loading the required {@code Configuration} in
order to create an extension. It holds
* the logic of ordering and solving conflicts during loading the configuration
@@ -31,7 +32,7 @@
public class ExtensionsManager extends Observable {
public static final ExtKey TRACE_LOG_CONTEXT_KEY = new
ExtKey("EXTENSION_MANAGER_TRACE_LOG",
- Log.class,
+ Logger.class,
"863db666-3ea7-4751-9695-918a3197ad83");
public static final ExtKey CAUSE_OUTPUT_KEY = new
ExtKey("EXTENSION_MANAGER_CAUSE_OUTPUT_KEY", Throwable.class,
"894e1c86-518b-40a2-a92b-29ea1eb0403d");
@@ -116,8 +117,8 @@
}
}
- private static final Log log =
LogFactory.getLog(ExtensionsManager.class.getName());
- private static final Log traceLog = LogFactory.getLog(getTraceLog());
+ private static final Logger log =
LoggerFactory.getLogger(ExtensionsManager.class.getName());
+ private static final Logger traceLog =
LoggerFactory.getLogger(ExtensionsManager.class.getName() + ".trace");
private static final Map<String, BindingsLoader> bindingsLoaders = new
HashMap<String, BindingsLoader>() {
{
@@ -146,7 +147,7 @@
}
private void dumpConfig(ExtensionProxy extension) {
- Log logger = extension.getContext().<Log> get(TRACE_LOG_CONTEXT_KEY);
+ Logger logger = extension.getContext().<Logger>
get(TRACE_LOG_CONTEXT_KEY);
if (logger.isDebugEnabled()) {
List sensitive =
extension.getContext().<List>get(Base.ContextKeys.CONFIGURATION_SENSITIVE_KEYS);
logger.debug("Config BEGIN");
@@ -217,10 +218,10 @@
entry.extension.getContext().put(
TRACE_LOG_CONTEXT_KEY,
- LogFactory.getLog(
+ LoggerFactory.getLogger(
String.format(
"%1$s.%2$s.%3$s",
- getTraceLog(),
+ traceLog.getName(),
entry.extension.getContext().get(Base.ContextKeys.EXTENSION_NAME),
entry.extension.getContext().get(Base.ContextKeys.INSTANCE_NAME)
)
@@ -241,10 +242,6 @@
setChanged();
notifyObservers();
return entry.name;
- }
-
- public static String getTraceLog() {
- return ExtensionsManager.class.getName() + ".trace";
}
public ExtMap getGlobalContext() {
@@ -299,13 +296,7 @@
)
);
} catch (Exception ex) {
- log.error(
- String.format(
- "Error in activating extension %1$s. Exception
message is %2$s",
- entry.name,
- ex.getMessage()
- )
- );
+ log.error("Error in activating extension {}. Exception message is
{}", entry.name, ex.getMessage());
if (log.isDebugEnabled()) {
log.debug(ex.toString(), ex);
}
@@ -352,8 +343,7 @@
for (ExtensionEntry entry : loadedEntries.values()) {
if (entry.extension != null) {
ExtMap context = entry.extension.getContext();
- log.info(String.format(
- "Instance name: '%1$s', Extension name: '%2$s', Version:
'%3$s', Notes: '%4$s', License: '%5$s', Home: '%6$s', Author '%7$s', Build
interface Version: '%8$s', File: '%9$s', Initialized: '%10$s'",
+ log.info("Instance name: '{}', Extension name: '{}', Version:
'{}', Notes: '{}', License: '{}', Home: '{}', Author '{}', Build interface
Version: '{}', File: '{}', Initialized: '{}'",
emptyIfNull(context.get(Base.ContextKeys.INSTANCE_NAME)),
emptyIfNull(context.get(Base.ContextKeys.EXTENSION_NAME)),
emptyIfNull(context.get(Base.ContextKeys.VERSION)),
@@ -364,7 +354,7 @@
emptyIfNull(context.get(Base.ContextKeys.BUILD_INTERFACE_VERSION)),
entry.getFileName(),
entry.initialized
- ));
+ );
}
}
log.info("End of enabled extensions list");
diff --git
a/backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml
b/backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml
index 030b554..09ea565 100644
---
a/backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml
+++
b/backend/manager/modules/extensions-manager/src/main/modules/org/ovirt/engine/core/extensions-manager/main/module.xml
@@ -9,7 +9,7 @@
<dependencies>
<module name="org.jboss.modules"/>
<module name="org.ovirt.engine.api.ovirt-engine-extensions-api"/>
- <module name="org.apache.commons.logging"/>
+ <module name="org.slf4j"/>
</dependencies>
</module>
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 1f7f70e..61ff49b 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
@@ -21,15 +21,15 @@
import org.ovirt.engine.core.extensions.mgr.ExtensionProxy;
import org.ovirt.engine.core.extensions.mgr.ExtensionsManager;
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.LoggerFactory;
+import org.slf4j.Logger;
public class EngineExtensionsManager extends ExtensionsManager {
private static final String ENGINE_EXTENSION_ENABLED =
"ENGINE_EXTENSION_ENABLED_";
private static volatile EngineExtensionsManager instance = null;
- private static Log log = LogFactory.getLog(EngineExtensionsManager.class);
+ private static Logger log =
LoggerFactory.getLogger(EngineExtensionsManager.class);
private final Set<String> multipleValuesKeys = new HashSet<>(Arrays.asList(
"AdUserName",
"AdUserId",
@@ -62,8 +62,8 @@
for (File directory :
EngineLocalConfig.getInstance().getExtensionsDirectories()) {
if (!directory.exists()) {
- log.warn(String.format("The directory '%1$s' cotaning
configuration files does not exist.",
- directory.getAbsolutePath()));
+ log.warn("The directory '{}' cotaning configuration files does
not exist.",
+ directory.getAbsolutePath());
} else {
// The order of the files inside the directory is relevant, as
the objects are created in
diff --git
a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
index ab70d4f..f174cb3 100644
---
a/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
+++
b/backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
@@ -30,6 +30,7 @@
<module name="org.ovirt.engine.core.uutils"/>
<module name="org.postgresql"/>
<module name="org.springframework"/>
+ <module name="org.slf4j"/>
</dependencies>
</module>
--
To view, visit http://gerrit.ovirt.org/28539
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I194a351677a38d814e987e63b405e43c415dea49
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
