You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/11/21 00:35:20 UTC
svn commit: r1640838 - in /felix/sandbox/pderop/dependencymanager-prototype:
org.apache.felix.dependencymanager.samples/
org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/
org.apache.felix.dependencyman...
Author: pderop
Date: Thu Nov 20 23:35:19 2014
New Revision: 1640838
URL: http://svn.apache.org/r1640838
Log:
Improved logging:
- When a Component.setDebug() method is used, we now log to the LogService instead of stdout.
- The Logger class can now configure its enabled log levels using the "org.apache.felix.dependencymanager.loglevel" bundle context property
The default for this property is 2, meaning all ERROR/WARNING are logged to the LogService, but not INFO or DEBUG messages.
set this property to 3 in order to enable ERR/WARN/INFO levels; or to 4 to enable all log levels.
- a Log interface is now exposed from the ComponentContext, in order to allow custom DM dependencies to be able to log debug messages
using the internal Component's Logger class. Doing so, allow to activate all Dependencies log levels by just calling Component.setDebug(String key) method.
Added:
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/Log.java
Modified:
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathDependencyImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleDependencyImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Logger.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java
felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/bnd.bnd Thu Nov 20 23:35:19 2014
@@ -32,7 +32,9 @@ Bundle-Version: 4.0.0
-runproperties: \
org.apache.felix.dependencymanager.parallel='!org.apache.felix.dependencymanager.samples.tpool, *',\
org.apache.felix.dependencymanager.runtime.log=warn,\
- org.apache.felix.log.maxSize=100000
+ org.apache.felix.dependencymanager.loglevel=2,\
+ org.apache.felix.log.maxSize=100000,\
+ org.apache.felix.log.storeDebug=true
-plugin: org.apache.felix.dm.annotation.plugin.bnd.AnnotationPlugin;log=debug;\
path:=${workspace}/org.apache.felix.dependencymanager.annotation/generated/org.apache.felix.dependencymanager.annotation.jar
-sub: \
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathDependencyImpl.java?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager.samples/src/org/apache/felix/dependencymanager/samples/customdep/PathDependencyImpl.java Thu Nov 20 23:35:19 2014
@@ -70,7 +70,7 @@ public class PathDependencyImpl extends
@Override
public void invokeCallback(EventType type, Event ...events) {
switch (type) {
- case ADDED:
+ case ADDED:
if (m_add != null) {
invoke(m_add, events[0], getInstances());
}
@@ -149,7 +149,7 @@ public class PathDependencyImpl extends
watckKey.reset();
}
} catch (Throwable e) {
- e.printStackTrace();
+ m_component.getLogger().err("path dependency exception", e);
}
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/ComponentContext.java Thu Nov 20 23:35:19 2014
@@ -34,12 +34,9 @@ import org.osgi.framework.BundleContext;
*/
public interface ComponentContext extends Component {
/**
- * Logs a message using the internal component logger
- * @param level the LogService log level
- * @param msg the msg to log
- * @param err an exception, or null
+ * Returns the logger which can be used by the DependencyManager Dependencies implementations.
*/
- public void log(int level, String msg, Throwable err);
+ public Log getLogger();
/**
* Returns the Component's bundle context
Added: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/Log.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/Log.java?rev=1640838&view=auto
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/Log.java (added)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/context/Log.java Thu Nov 20 23:35:19 2014
@@ -0,0 +1,77 @@
+package org.apache.felix.dm.context;
+
+/**
+ * DependencyManager Dependencies may log messages using this interface, which can be obtained from the ComponentContext
+ * interface.
+ */
+public interface Log {
+ /**
+ * Logs a message using LogService.LOG_ERROR log level
+ * @param format the message format
+ * @param params the message parameters
+ */
+ public void err(String format, Object ... params);
+
+ /**
+ * Logs a message using LogService.LOG_ERROR log level
+ * @param format the message format
+ * @param err a Throwable stacktrace
+ * @param params the message parameters
+ */
+ public void err(String format, Throwable err, Object ... params);
+
+ /**
+ * Logs a message using LogService.LOG_WARNING log level
+ * @param format the message format
+ * @param params the message parameters
+ */
+ public void warn(String format, Object ... params);
+
+ /**
+ * Logs a message using LogService.LOG_WARNING log level
+ * @param format the message format
+ * @param err a Throwable stacktrace
+ * @param params the message parameters
+ */
+ public void warn(String format, Throwable err, Object ... params);
+
+ /**
+ * Is the LogService.LOG_INFO level enabled ?
+ */
+ public boolean info();
+
+ /**
+ * Logs a message using LogService.LOG_INFO log level
+ * @param format the message format
+ * @param params the message parameters
+ */
+ public void info(String format, Object ... params);
+
+ /**
+ * Logs a message using LogService.LOG_INFO log level
+ * @param format the message format
+ * @param err a Throwable stacktrace
+ * @param params the message parameters
+ */
+ public void info(String format, Throwable err, Object ... params);
+
+ /**
+ * Is the LogService.LOG_DEBUG level enabled ?
+ */
+ public boolean debug();
+
+ /**
+ * Logs a message using LogService.LOG_DEBUG log level
+ * @param format the message format
+ * @param params the message parameters
+ */
+ public void debug(String format, Object ... params);
+
+ /**
+ * Logs a message using LogService.LOG_DEBUG log level
+ * @param format the message format
+ * @param err a Throwable stacktrace
+ * @param params the message parameters
+ */
+ public void debug(String format, Throwable err, Object ... params);
+}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleDependencyImpl.java?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/BundleDependencyImpl.java Thu Nov 20 23:35:19 2014
@@ -237,10 +237,10 @@ public class BundleDependencyImpl extend
return (Dictionary<String, Object>) InvocationUtil.invokeCallbackMethod(m_propagateCallbackInstance, m_propagateCallbackMethod, new Class[][] {{ Bundle.class }}, new Object[][] {{ bundle }});
}
catch (InvocationTargetException e) {
- m_component.log(LogService.LOG_WARNING, "Exception while invoking callback method", e.getCause());
+ m_component.getLogger().warn("Exception while invoking callback method", e.getCause());
}
catch (Throwable e) {
- m_component.log(LogService.LOG_WARNING, "Exception while trying to invoke callback method", e);
+ m_component.getLogger().warn("Exception while trying to invoke callback method", e);
}
throw new IllegalStateException("Could not invoke callback");
}
@@ -272,7 +272,7 @@ public class BundleDependencyImpl extend
m_nullObject = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] { Bundle.class }, new DefaultNullObject());
}
catch (Throwable e) {
- m_component.log(Logger.LOG_ERROR, "Could not create null object for Bundle.", e);
+ m_component.getLogger().err("Could not create null object for Bundle.", e);
}
}
return (Bundle) m_nullObject;
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ComponentImpl.java Thu Nov 20 23:35:19 2014
@@ -86,14 +86,11 @@ public class ComponentImpl implements Co
// Holds all the services of a given dependency context. Caution: the last entry in the skiplist is the highest ranked service.
private final Map<DependencyContext, ConcurrentSkipListSet<Event>> m_dependencyEvents = new HashMap<>();
private final AtomicBoolean m_active = new AtomicBoolean(false);
-
- private boolean debug = false;
- private String debugKey;
-
+
public Component setDebug(String debugKey) {
- System.out.println("*" + debugKey + " set debug");
- this.debugKey = debugKey;
- this.debug = true;
+ // Force debug level in our logger
+ m_logger.setEnabledLevel(LogService.LOG_DEBUG);
+ m_logger.setDebugKey(debugKey);
return this;
}
@@ -311,9 +308,7 @@ public class ComponentImpl implements Co
if (! m_isStarted) {
return;
}
- if (debug) {
- System.out.println("*" + debugKey + " T" + Thread.currentThread().getId() + " handleAdded " + e);
- }
+ m_logger.debug("handleAdded %s", e);
Set<Event> dependencyEvents = m_dependencyEvents.get(dc);
dependencyEvents.add(e);
@@ -458,25 +453,18 @@ public class ComponentImpl implements Co
}
private void handleChange() {
- if (debug) {
- System.out.println("*" + debugKey + " T" + Thread.currentThread().getId() + " handleChange");
- }
+ m_logger.debug("handleChanged");
try {
ComponentState oldState;
ComponentState newState;
do {
oldState = m_state;
newState = calculateNewState(oldState);
- if (debug) {
- System.out.println("*" + debugKey + " T" + Thread.currentThread().getId() + " " + oldState
- + " -> " + newState);
- }
+ m_logger.debug("%s -> %s", oldState, newState);
m_state = newState;
} while (performTransition(oldState, newState));
} finally {
- if (debug) {
- System.out.println("*" + debugKey + " T" + Thread.currentThread().getId() + " end handling change.");
- }
+ m_logger.debug("end handling change.");
}
}
@@ -522,9 +510,6 @@ public class ComponentImpl implements Co
return true;
}
if (oldState == ComponentState.WAITING_FOR_REQUIRED && newState == ComponentState.INSTANTIATED_AND_WAITING_FOR_REQUIRED) {
- if (debug) {
- System.out.println("*" + debugKey + " T" + Thread.currentThread().getId() + " instantiate!");
- }
instantiateComponent();
invokeAutoConfigDependencies();
invokeAddRequiredDependencies();
@@ -625,9 +610,7 @@ public class ComponentImpl implements Co
private void startDependencies(List<DependencyContext> dependencies) {
// Start first optional dependencies first.
- if (debug) {
- System.out.println("*" + debugKey + " T" + Thread.currentThread().getId() + " startDependencies.");
- }
+ m_logger.debug("startDependencies.");
List<DependencyContext> requiredDeps = new ArrayList<>();
for (DependencyContext d : dependencies) {
if (d.isRequired()) {
@@ -731,6 +714,8 @@ public class ComponentImpl implements Co
}
private void instantiateComponent() {
+ m_logger.debug("instantiating component.");
+
// TODO add more complex factory instantiations of one or more components in a composition here
if (m_componentInstance == null) {
if (m_componentDefinition instanceof Class) {
@@ -1301,8 +1286,8 @@ public class ComponentImpl implements Co
@Override
public String toString() {
- if (debug) {
- return debugKey;
+ if (m_logger.getDebugKey() != null) {
+ return m_logger.getDebugKey();
}
return getClassName();
}
@@ -1313,6 +1298,7 @@ public class ComponentImpl implements Co
m_executor = new DispatchExecutor(threadPool, m_logger);
}
+ @Override
public Logger getLogger() {
return m_logger;
}
@@ -1325,9 +1311,4 @@ public class ComponentImpl implements Co
private Executor getExecutor() {
return m_executor;
}
-
- @Override
- public void log(int level, String msg, Throwable err) {
- m_logger.log(level, msg, err);
- }
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/FilterComponent.java Thu Nov 20 23:35:19 2014
@@ -35,6 +35,7 @@ import org.apache.felix.dm.context.Compo
import org.apache.felix.dm.context.DependencyContext;
import org.apache.felix.dm.context.Event;
import org.apache.felix.dm.context.EventType;
+import org.apache.felix.dm.context.Log;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -336,12 +337,12 @@ public class FilterComponent implements
}
@Override
- public void log(int level, String msg, Throwable err) {
- m_component.log(level, msg, err);
+ public Bundle getBundle() {
+ return m_component.getBundle();
}
@Override
- public Bundle getBundle() {
- return m_component.getBundle();
+ public Log getLogger() {
+ return m_component.getLogger();
}
}
\ No newline at end of file
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Logger.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Logger.java?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Logger.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/Logger.java Thu Nov 20 23:35:19 2014
@@ -22,6 +22,7 @@ import java.lang.reflect.InvocationTarge
import java.lang.reflect.Method;
import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.context.Log;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.FrameworkUtil;
@@ -29,6 +30,7 @@ import org.osgi.framework.InvalidSyntaxE
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
/**
* This class mimics the standard OSGi <tt>LogService</tt> interface. An
@@ -47,7 +49,7 @@ import org.osgi.framework.ServiceReferen
*
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
*/
-public class Logger implements ServiceListener {
+public class Logger implements ServiceListener, Log {
private static final String LOG_SINGLE_CONTEXT = "org.apache.felix.dependencymanager.singleContextLog";
public static final int LOG_ERROR = 1;
public static final int LOG_WARNING = 2;
@@ -58,8 +60,11 @@ public class Logger implements ServiceLi
private final static int LOGGER_OBJECT_IDX = 0;
private final static int LOGGER_METHOD_IDX = 1;
+ private static final String ENABLED_LOG_LEVEL = "org.apache.felix.dependencymanager.loglevel";
private ServiceReference m_logRef = null;
private Object[] m_logger = null;
+ private int m_enabledLevel = LogService.LOG_WARNING;
+ private String m_debugKey;
public Logger(BundleContext context) {
if ("true".equals(System.getProperty(LOG_SINGLE_CONTEXT))) {
@@ -68,10 +73,16 @@ public class Logger implements ServiceLi
m_context = context;
}
if (m_context != null) {
+ String enabledLevel = m_context.getProperty(ENABLED_LOG_LEVEL);
+ if (enabledLevel != null) {
+ try {
+ m_enabledLevel = Integer.valueOf(enabledLevel);
+ } catch (NumberFormatException e) {}
+ }
startListeningForLogService();
}
}
-
+
public final void log(int level, String msg) {
_log(null, level, msg, null);
}
@@ -117,16 +128,26 @@ public class Logger implements ServiceLi
}
private void _log(ServiceReference sr, int level, String msg, Throwable throwable) {
- // Save our own copy just in case it changes. We could try to do
- // more conservative locking here, but let's be optimistic.
- Object[] logger = m_logger;
- // Use the log service if available.
- if (logger != null) {
- _logReflectively(logger, sr, level, msg, throwable);
- }
- // Otherwise, default logging action.
- else {
- doLog(sr, level, msg, throwable);
+ if (level <= m_enabledLevel) {
+ StringBuilder sb = new StringBuilder("[");
+ if (m_debugKey != null) {
+ sb.append(m_debugKey).append(" - ");
+ }
+ sb.append(Thread.currentThread().getName());
+ sb.append("] ");
+ sb.append(msg);
+
+ // Save our own copy just in case it changes. We could try to do
+ // more conservative locking here, but let's be optimistic.
+ Object[] logger = m_logger;
+ // Use the log service if available.
+ if (logger != null) {
+ _logReflectively(logger, sr, level, sb.toString(), throwable);
+ }
+ // Otherwise, default logging action.
+ else {
+ doLog(sr, level, sb.toString(), throwable);
+ }
}
}
@@ -234,4 +255,68 @@ public class Logger implements ServiceLi
}
}
}
+
+ public void setEnabledLevel(int enabledLevel) {
+ m_enabledLevel = enabledLevel;
+ }
+
+ public void setDebugKey(String debugKey) {
+ m_debugKey = debugKey;
+ }
+
+ public String getDebugKey() {
+ return m_debugKey;
+ }
+
+ // --------------- org.apache.felix.dm.context.Log interface --------------------------------------------
+
+ @Override
+ public void err(String format, Object... params) {
+ log(LogService.LOG_ERROR, String.format(format, params));
+ }
+
+ @Override
+ public void err(String format, Throwable err, Object... params) {
+ log(LogService.LOG_ERROR, String.format(format, params), err);
+ }
+
+ @Override
+ public void warn(String format, Object... params) {
+ log(LogService.LOG_WARNING, String.format(format, params));
+ }
+
+ @Override
+ public void warn(String format, Throwable err, Object... params) {
+ log(LogService.LOG_WARNING, String.format(format, params), err);
+ }
+
+ @Override
+ public boolean info() {
+ return m_enabledLevel >= LogService.LOG_INFO;
+ }
+
+ @Override
+ public void info(String format, Object... params) {
+ log(LogService.LOG_INFO, String.format(format, params));
+ }
+
+ @Override
+ public void info(String format, Throwable err, Object... params) {
+ log(LogService.LOG_INFO, String.format(format, params), err);
+ }
+
+ @Override
+ public boolean debug() {
+ return m_enabledLevel >= LogService.LOG_DEBUG;
+ }
+
+ @Override
+ public void debug(String format, Object... params) {
+ log(LogService.LOG_DEBUG, String.format(format, params));
+ }
+
+ @Override
+ public void debug(String format, Throwable err, Object... params) {
+ log(LogService.LOG_DEBUG, String.format(format, params), err);
+ }
}
\ No newline at end of file
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ResourceDependencyImpl.java Thu Nov 20 23:35:19 2014
@@ -198,10 +198,10 @@ public class ResourceDependencyImpl exte
return (Dictionary<String, Object>) InvocationUtil.invokeCallbackMethod(m_propagateCallbackInstance, m_propagateCallbackMethod, new Class[][] {{ URL.class }}, new Object[][] {{ resource }});
}
catch (InvocationTargetException e) {
- m_component.log(LogService.LOG_WARNING, "Exception while invoking callback method", e.getCause());
+ m_component.getLogger().warn("Exception while invoking callback method", e.getCause());
}
catch (Throwable e) {
- m_component.log(LogService.LOG_WARNING, "Exception while trying to invoke callback method", e);
+ m_component.getLogger().warn("Exception while trying to invoke callback method", e);
}
throw new IllegalStateException("Could not invoke callback");
}
@@ -222,7 +222,9 @@ public class ResourceDependencyImpl exte
!key.equals(ResourceHandler.PORT)) {
props.put(key, resourceProperties.get(key).toString());
} else {
- m_component.log(LogService.LOG_WARNING, "Custom resource property is overlapping with the default resource property for key: " + key, null);
+ m_component.getLogger().warn(
+ "Custom resource property is overlapping with the default resource property for key: %s",
+ key);
}
}
}
Modified: felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java?rev=1640838&r1=1640837&r2=1640838&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/org.apache.felix.dependencymanager/src/org/apache/felix/dm/impl/ServiceDependencyImpl.java Thu Nov 20 23:35:19 2014
@@ -240,8 +240,8 @@ public class ServiceDependencyImpl exten
} catch (IllegalStateException e) {
// most likely our bundle is being stopped. Only log an exception if our component is enabled.
if (m_component.isActive()) {
- m_component.log(Logger.LOG_WARNING, "could not handle service dependency for component "
- + m_component.getComponentDeclaration().getClassName(), e);
+ m_component.getLogger().warn("could not handle service dependency for component %s", e,
+ m_component.getComponentDeclaration().getClassName());
}
return null;
}
@@ -364,9 +364,9 @@ public class ServiceDependencyImpl exten
new Class[][]{{ServiceReference.class, Object.class}, {ServiceReference.class}}, new Object[][]{
{se.getReference(), se.getEvent()}, {se.getReference()}});
} catch (InvocationTargetException e) {
- m_component.log(LogService.LOG_WARNING, "Exception while invoking callback method", e.getCause());
+ m_component.getLogger().warn("Exception while invoking callback method", e.getCause());
} catch (Throwable e) {
- m_component.log(LogService.LOG_WARNING, "Exception while trying to invoke callback method", e);
+ m_component.getLogger().warn("Exception while trying to invoke callback method", e);
}
throw new IllegalStateException("Could not invoke callback");
} else {
@@ -442,7 +442,7 @@ public class ServiceDependencyImpl exten
new Class[] { trackedServiceName }, new DefaultNullObject());
}
catch (Throwable err) {
- m_component.log(Logger.LOG_ERROR, "Could not create null object for " + trackedServiceName + ".", err);
+ m_component.getLogger().err("Could not create null object for %s.", err, trackedServiceName);
}
}
return m_nullObject;
@@ -455,8 +455,8 @@ public class ServiceDependencyImpl exten
m_defaultImplementationInstance = ((Class<?>) m_defaultImplementation).newInstance();
}
catch (Throwable e) {
- m_component.log(Logger.LOG_ERROR, "Could not create default implementation instance of class "
- + m_defaultImplementation + ".", e);
+ m_component.getLogger().err("Could not create default implementation instance of class %s.", e,
+ m_defaultImplementation);
}
}
else {
@@ -537,7 +537,7 @@ public class ServiceDependencyImpl exten
{m_component, previousReference, previous, currentReference, current}}
);
} catch (Throwable e) {
- m_component.log(Logger.LOG_ERROR, "Could not invoke swap callback", e);
+ m_component.getLogger().err("Could not invoke swap callback", e);
}
}