Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BC7FC200BD4 for ; Thu, 1 Dec 2016 10:44:48 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BB082160B2C; Thu, 1 Dec 2016 09:44:48 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 18DF1160B0B for ; Thu, 1 Dec 2016 10:44:47 +0100 (CET) Received: (qmail 25333 invoked by uid 500); 1 Dec 2016 09:44:46 -0000 Mailing-List: contact commits-help@flink.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flink.apache.org Delivered-To: mailing list commits@flink.apache.org Received: (qmail 25237 invoked by uid 99); 1 Dec 2016 09:44:46 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2016 09:44:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 14EB6E09CD; Thu, 1 Dec 2016 09:44:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: uce@apache.org To: commits@flink.apache.org Date: Thu, 01 Dec 2016 09:44:46 -0000 Message-Id: <951291b245114b0a9b8bcf82bc8f2d10@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/7] flink git commit: [FLINK-5192] [logging] Improve log config templates archived-at: Thu, 01 Dec 2016 09:44:48 -0000 Repository: flink Updated Branches: refs/heads/master 3223a160f -> 7d66aaeb0 [FLINK-5192] [logging] Improve log config templates This closes #2899. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7d66aaeb Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7d66aaeb Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7d66aaeb Branch: refs/heads/master Commit: 7d66aaeb0fb52c5cd258e8b32ba8394eedd5d4ca Parents: bf859e7 Author: Ufuk Celebi Authored: Tue Nov 29 17:14:23 2016 +0100 Committer: Ufuk Celebi Committed: Thu Dec 1 10:44:23 2016 +0100 ---------------------------------------------------------------------- .../src/main/flink-bin/conf/log4j.properties | 14 +++++++++- flink-dist/src/main/flink-bin/conf/logback.xml | 28 +++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/7d66aaeb/flink-dist/src/main/flink-bin/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/conf/log4j.properties b/flink-dist/src/main/flink-bin/conf/log4j.properties index 97ec653..8e00ce3 100644 --- a/flink-dist/src/main/flink-bin/conf/log4j.properties +++ b/flink-dist/src/main/flink-bin/conf/log4j.properties @@ -16,8 +16,20 @@ # limitations under the License. ################################################################################ +# This affects logging for both user code and Flink log4j.rootLogger=INFO, file +# Uncomment this if you want to _only_ change Flink's logging +#log4j.logger.org.apache.flink=INFO + +# The following lines keep the log level of common libraries/connectors on +# log level INFO. The root logger does not override this. You have to manually +# change the log levels here. +log4j.logger.akka=INFO +log4j.logger.org.apache.kafka=INFO +log4j.logger.org.apache.hadoop=INFO +log4j.logger.org.apache.zookeeper=INFO + # Log all infos in the given file log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.file=${log.file} @@ -25,5 +37,5 @@ log4j.appender.file.append=false log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %-60c %x - %m%n -# suppress the irrelevant (wrong) warnings from the netty channel handler +# Suppress the irrelevant (wrong) warnings from the Netty channel handler log4j.logger.org.jboss.netty.channel.DefaultChannelPipeline=ERROR, file http://git-wip-us.apache.org/repos/asf/flink/blob/7d66aaeb/flink-dist/src/main/flink-bin/conf/logback.xml ---------------------------------------------------------------------- diff --git a/flink-dist/src/main/flink-bin/conf/logback.xml b/flink-dist/src/main/flink-bin/conf/logback.xml index 1147a70..f3c4331 100644 --- a/flink-dist/src/main/flink-bin/conf/logback.xml +++ b/flink-dist/src/main/flink-bin/conf/logback.xml @@ -25,8 +25,34 @@ + - + + + + + + + + + + + + + + + + + + + + + + + +