You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/08/14 13:59:36 UTC
svn commit: r1695870 - in
/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger:
JDK14Logger.java LogServiceLogger.java
Author: cziegeler
Date: Fri Aug 14 11:59:36 2015
New Revision: 1695870
URL: http://svn.apache.org/r1695870
Log:
FELIX-4994 : Use Java Logging API in spite of System.out. Apply modified patch from Enrique Ruiz
Added:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java (with props)
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceLogger.java
Added: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java?rev=1695870&view=auto
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java (added)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java Fri Aug 14 11:59:36 2015
@@ -0,0 +1,95 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.http.base.internal.logger;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Logger based on Java Logging API.
+ *
+ */
+public final class JDK14Logger
+ extends AbstractLogger
+{
+ private final Logger defaultLogger = Logger.getLogger(LogServiceLogger.class.getName());
+ private final Level defaultLevel = Level.OFF;
+ private BundleContext context;
+
+ public JDK14Logger(BundleContext context)
+ {
+ this.context = context;
+ }
+
+ @Override
+ public void log(ServiceReference ref, int level, String message, Throwable cause)
+ {
+ Object service = null;
+ Class clazz = null;
+ Logger logger = null;
+
+ if(ref != null)
+ {
+ service = context.getService(ref);
+ }
+
+ if(service != null)
+ {
+ clazz = service.getClass();
+ }
+
+ if(clazz != null)
+ {
+ logger = Logger.getLogger(clazz.getName());
+ }
+ else
+ {
+ logger = defaultLogger;
+ }
+
+ Level logLevel = defaultLevel;
+ switch (level)
+ {
+ case LOG_DEBUG:
+ logLevel = Level.FINE;
+ break;
+ case LOG_INFO:
+ logLevel = Level.INFO;
+ break;
+ case LOG_WARNING:
+ logLevel = Level.WARNING;
+ break;
+ case LOG_ERROR:
+ logLevel = Level.SEVERE;
+ break;
+ }
+
+ if (cause != null)
+ {
+ logger.log(logLevel, message, cause);
+ }
+ else
+ {
+ logger.log(logLevel, message);
+ }
+ }
+}
Propchange: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/JDK14Logger.java
------------------------------------------------------------------------------
svn:keywords = author date id revision rev url
Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceLogger.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceLogger.java?rev=1695870&r1=1695869&r2=1695870&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceLogger.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/logger/LogServiceLogger.java Fri Aug 14 11:59:36 2015
@@ -18,20 +18,30 @@
*/
package org.apache.felix.http.base.internal.logger;
-import org.osgi.util.tracker.ServiceTracker;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;
+import org.osgi.util.tracker.ServiceTracker;
public final class LogServiceLogger
extends AbstractLogger
{
- private final ConsoleLogger consoleLogger;
+ private final LogService defaultLogger;
private final ServiceTracker tracker;
- public LogServiceLogger(BundleContext context)
+ private static final String JUL_LOGGER = "org.apache.felix.http.log.jul";
+
+ public LogServiceLogger(final BundleContext context)
{
- this.consoleLogger = new ConsoleLogger();
+ Object julLogOpt = context.getProperty(JUL_LOGGER);
+ if ( julLogOpt == null ) {
+ julLogOpt = System.getProperty(JUL_LOGGER);
+ }
+ if ( julLogOpt != null ) {
+ this.defaultLogger = new JDK14Logger(context);
+ } else {
+ this.defaultLogger = new ConsoleLogger();
+ }
this.tracker = new ServiceTracker(context, LogService.class.getName(), null);
this.tracker.open();
}
@@ -41,13 +51,14 @@ public final class LogServiceLogger
this.tracker.close();
}
+ @Override
public void log(ServiceReference ref, int level, String message, Throwable cause)
{
LogService log = (LogService)this.tracker.getService();
if (log != null) {
log.log(ref, level, message, cause);
} else {
- this.consoleLogger.log(ref, level, message, cause);
+ this.defaultLogger.log(ref, level, message, cause);
}
}
}