Author: pderop
Date: Tue Feb 9 21:21:39 2016
New Revision: 1729458
URL: http://svn.apache.org/viewvc?rev=1729458&view=rev
Log:
FELIX-5181: Only log info/debug if dm annotation log parameter is enabled.
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Activator.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Log.java
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Activator.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Activator.java?rev=1729458&r1=1729457&r2=1729458&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Activator.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Activator.java
Tue Feb 9 21:21:39 2016
@@ -64,6 +64,8 @@ public class Activator extends Dependenc
@Override
public void init(BundleContext context, DependencyManager dm) throws
Exception
{
+ boolean logEnabled =
"true".equalsIgnoreCase(context.getProperty(CONF_LOG));
+ Log.instance().enableLogs(logEnabled);
Component component = createComponent()
.setImplementation(DependencyManagerRuntime.class)
.setComposition("getComposition")
@@ -76,7 +78,7 @@ public class Activator extends Dependenc
.setRequired(true)
.setService(PackageAdmin.class))
.add(createServiceDependency()
-
.setRequired("true".equalsIgnoreCase(context.getProperty(CONF_LOG)))
+ .setRequired(logEnabled)
.setService(LogService.class));
dm.add(component);
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyManagerRuntime.java?rev=1729458&r1=1729457&r2=1729458&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/DependencyManagerRuntime.java
Tue Feb 9 21:21:39 2016
@@ -88,7 +88,7 @@ public class DependencyManagerRuntime
*/
protected void start()
{
- Log.instance().info("Starting Dependency Manager annotation runtime");
+ Log.instance().info("Starting Dependency Manager annotation runtime.");
}
/**
Modified:
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Log.java
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Log.java?rev=1729458&r1=1729457&r2=1729458&view=diff
==============================================================================
---
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Log.java
(original)
+++
felix/trunk/dependencymanager/org.apache.felix.dependencymanager.runtime/src/org/apache/felix/dm/runtime/Log.java
Tue Feb 9 21:21:39 2016
@@ -29,6 +29,9 @@ public class Log
{
/** The wrap log service which is actually used (Injected by Activator) */
private volatile LogService m_logService;
+
+ /** Log INFO/DEBUG only if logs are enabled, else only log ERROR/WARN
messages */
+ private volatile boolean m_logEnabled;
/** Our sole instance */
private static Log m_instance = new Log();
@@ -38,6 +41,11 @@ public class Log
return m_instance;
}
+ public void enableLogs(boolean logEnabled)
+ {
+ m_logEnabled = logEnabled;
+ }
+
public void error(String format, Object ... args)
{
m_logService.log(LogService.LOG_ERROR, String.format(format, args));
@@ -60,21 +68,25 @@ public class Log
public void info(String format, Object ... args)
{
- m_logService.log(LogService.LOG_INFO, String.format(format, args));
+ if (m_logEnabled)
+ m_logService.log(LogService.LOG_INFO, String.format(format, args));
}
public void info(String format, Throwable t, Object ... args)
{
- m_logService.log(LogService.LOG_INFO, String.format(format, args), t);
+ if (m_logEnabled)
+ m_logService.log(LogService.LOG_INFO,
String.format(format, args), t);
}
public void debug(String format, Object ... args)
{
- m_logService.log(LogService.LOG_DEBUG, String.format(format, args));
+ if (m_logEnabled)
+ m_logService.log(LogService.LOG_DEBUG,
String.format(format, args));
}
public void debug(String format, Throwable t, Object ... args)
{
- m_logService.log(LogService.LOG_DEBUG, String.format(format, args), t);
+ if (m_logEnabled)
+ m_logService.log(LogService.LOG_DEBUG,
String.format(format, args), t);
}
}
