You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pb...@apache.org on 2017/04/11 10:04:27 UTC
oozie git commit: OOZIE-2860 Improve Jetty logging (andras.piros via
pbacsko)
Repository: oozie
Updated Branches:
refs/heads/master 0f27f92d2 -> 2237bbd82
OOZIE-2860 Improve Jetty logging (andras.piros via pbacsko)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2237bbd8
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2237bbd8
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2237bbd8
Branch: refs/heads/master
Commit: 2237bbd82d49e344aebdbb02e4ff7fa69743efb5
Parents: 0f27f92
Author: Peter Bacsko <pb...@cloudera.com>
Authored: Tue Apr 11 12:04:17 2017 +0200
Committer: Peter Bacsko <pb...@cloudera.com>
Committed: Tue Apr 11 12:04:17 2017 +0200
----------------------------------------------------------------------
core/pom.xml | 6 +++++
core/src/main/conf/oozie-log4j.properties | 13 ++++++++++
.../src/main/resources/jetty-logging.properties | 26 ++++++++++++++++++++
core/src/main/resources/oozie-log4j.properties | 7 ++++--
distro/pom.xml | 6 +++++
release-log.txt | 1 +
webapp/pom.xml | 4 +++
7 files changed, 61 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/2237bbd8/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1dd1045..a54b284 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -132,6 +132,12 @@
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-client</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/oozie/blob/2237bbd8/core/src/main/conf/oozie-log4j.properties
----------------------------------------------------------------------
diff --git a/core/src/main/conf/oozie-log4j.properties b/core/src/main/conf/oozie-log4j.properties
index c563687..c1a555d 100644
--- a/core/src/main/conf/oozie-log4j.properties
+++ b/core/src/main/conf/oozie-log4j.properties
@@ -103,6 +103,19 @@ log4j.appender.openjpa.Append=true
log4j.appender.openjpa.layout=org.apache.log4j.PatternLayout
log4j.appender.openjpa.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n
+log4j.appender.jetty=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.jetty.DatePattern='.'yyyy-MM-dd
+log4j.appender.jetty.File=${oozie.log.dir}/jetty.log
+log4j.appender.jetty.Append=true
+log4j.appender.jetty.layout=org.apache.log4j.PatternLayout
+log4j.appender.jetty.layout.ConversionPattern=%d{ISO8601} %5p %c{1}:%L - %m%n
+
+log4j.appender.none=org.apache.log4j.varia.NullAppender
+
+# Explicitly switch off root logger: anything interesting goes
+# already either to jetty or one of the oozie appenders
+log4j.rootLogger=NONE, none
+log4j.logger.org.eclipse.jetty=INFO, jetty
log4j.logger.openjpa=INFO, openjpa
log4j.logger.oozieops=INFO, oozieops
log4j.logger.oozieinstrumentation=ALL, oozieinstrumentation
http://git-wip-us.apache.org/repos/asf/oozie/blob/2237bbd8/core/src/main/resources/jetty-logging.properties
----------------------------------------------------------------------
diff --git a/core/src/main/resources/jetty-logging.properties b/core/src/main/resources/jetty-logging.properties
new file mode 100644
index 0000000..3da7c30
--- /dev/null
+++ b/core/src/main/resources/jetty-logging.properties
@@ -0,0 +1,26 @@
+#
+# 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.
+#
+# 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. See accompanying LICENSE file.
+#
+org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.Slf4jLog
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/oozie/blob/2237bbd8/core/src/main/resources/oozie-log4j.properties
----------------------------------------------------------------------
diff --git a/core/src/main/resources/oozie-log4j.properties b/core/src/main/resources/oozie-log4j.properties
index c86b301..05fb37a 100644
--- a/core/src/main/resources/oozie-log4j.properties
+++ b/core/src/main/resources/oozie-log4j.properties
@@ -33,6 +33,11 @@ log4j.appender.test.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
log4j.appender.none=org.apache.log4j.varia.NullAppender
+# Explicitly switch off root logger: anything interesting goes
+# already to test appender
+log4j.rootLogger=NONE, none
+log4j.logger.org.eclipse.jetty=INFO, test
+
log4j.logger.oozieops=NONE, none
log4j.logger.oozieinstrumentation=NONE, none
log4j.logger.oozieaudit=NONE, none
@@ -54,5 +59,3 @@ log4j.logger.org.apache.oozie.sla=DEBUG, test
log4j.logger.org.apache.hadoop=INFO, test
log4j.logger.org.mortbay=INFO, test
log4j.logger.org.hsqldb=INFO, test
-
-
http://git-wip-us.apache.org/repos/asf/oozie/blob/2237bbd8/distro/pom.xml
----------------------------------------------------------------------
diff --git a/distro/pom.xml b/distro/pom.xml
index a8590e2..58bee8c 100644
--- a/distro/pom.xml
+++ b/distro/pom.xml
@@ -41,6 +41,12 @@
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-client</artifactId>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.oozie</groupId>
http://git-wip-us.apache.org/repos/asf/oozie/blob/2237bbd8/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index cb81d42..ffa5c53 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.4.0 release (trunk - unreleased)
+OOZIE-2860 Improve Jetty logging (andras.piros via pbacsko)
OOZIE-2457 Oozie log parsing regex consume more than 90% cpu (satishsaley)
OOZIE-2844 Increase stability of Oozie actions when log4j.properties is missing or not readable (andras.piros via pbacsko)
OOZIE-2701 Oozie to support Multiple HCatalog URIs (abhishekbafna)
http://git-wip-us.apache.org/repos/asf/oozie/blob/2237bbd8/webapp/pom.xml
----------------------------------------------------------------------
diff --git a/webapp/pom.xml b/webapp/pom.xml
index 2c4dfc2..e4fdfb7 100644
--- a/webapp/pom.xml
+++ b/webapp/pom.xml
@@ -40,6 +40,10 @@
<groupId>org.apache.oozie</groupId>
<artifactId>oozie-hadoop-auth</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
</exclusions>
</dependency>