You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by da...@apache.org on 2018/03/27 02:39:43 UTC
[1/2] incubator-s2graph git commit: migrate log4j.properties to
log4j2.xml
Repository: incubator-s2graph
Updated Branches:
refs/heads/master 0520ffc17 -> bb9738f26
migrate log4j.properties to log4j2.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/741bf47d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/741bf47d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/741bf47d
Branch: refs/heads/master
Commit: 741bf47d0f62fb9720d461e27e4264f4f313fb84
Parents: 0520ffc
Author: sandyskies <ch...@163.com>
Authored: Fri Mar 23 11:57:16 2018 +0800
Committer: sandyskies <ch...@163.com>
Committed: Fri Mar 23 11:57:16 2018 +0800
----------------------------------------------------------------------
conf/log4j.properties | 27 ---------------------------
conf/log4j2.xml | 20 ++++++++++++++++++++
2 files changed, 20 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/741bf47d/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/conf/log4j.properties b/conf/log4j.properties
deleted file mode 100644
index c13e516..0000000
--- a/conf/log4j.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.
-
-log4j.rootLogger=${root.logger}
-root.logger=INFO,console
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.target=System.err
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
-
-# The noisier spark/kafka logs are suppressed
-log4j.logger.org.apache.spark=WARN,console
-log4j.logger.org.apache.kafka=WARN,console
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/741bf47d/conf/log4j2.xml
----------------------------------------------------------------------
diff --git a/conf/log4j2.xml b/conf/log4j2.xml
new file mode 100644
index 0000000..f96ecf1
--- /dev/null
+++ b/conf/log4j2.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Configuration status="INFO">
+ <Appenders>
+ <Console name="console" target="SYSTEM_ERR">
+ <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n"/>
+ </Console>
+ </Appenders>
+ <Loggers>
+ <Root level="INFO">
+ <AppenderRef ref="console"/>
+ </Root>
+ <Logger level="WARN" name="org.apache.spark">
+ <AppenderRef ref="console"/>
+ </Logger>
+ <Logger level="WARN" name="org.apache.kafka">
+ <AppenderRef ref="console"/>
+ </Logger>
+ </Loggers>
+</Configuration>
[2/2] incubator-s2graph git commit: [S2GRAPH-188]: Should migrate
log4j.properties to log4j2.xml
Posted by da...@apache.org.
[S2GRAPH-188]: Should migrate log4j.properties to log4j2.xml
JIRA:
[S2GRAPH-188] https://issues.apache.org/jira/browse/S2GRAPH-188
Pull Request:
Closes #141
Author
sandyskies <ch...@163.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/bb9738f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/bb9738f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/bb9738f2
Branch: refs/heads/master
Commit: bb9738f26bbac67aeb273db36d4e95b296768bb7
Parents: 741bf47
Author: daewon <da...@apache.org>
Authored: Tue Mar 27 11:31:37 2018 +0900
Committer: daewon <da...@apache.org>
Committed: Tue Mar 27 11:31:37 2018 +0900
----------------------------------------------------------------------
CHANGES | 1 +
conf/log4j2.xml | 20 ++++++++++++++++++++
s2rest_play/conf/log4j.properties | 1 -
s2rest_play/conf/log4j2.xml | 1 +
4 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/bb9738f2/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index cae242a..b4ca56e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -43,6 +43,7 @@ Release Notes - S2Graph - Version 0.2.0
* [S2GRAPH-181] - MutateVertices yield different state with different storage type
* [S2GRAPH-184] - spark driver exit abnormally in the loader of s2jobs
* [S2GRAPH-186] - fix wrong escaping of double quotation marks
+ * [S2GRAPH-188] - migrate log4j.properties to log4j2.xml
** Improvement
* [S2GRAPH-72] - Support Apache TinkerPop and Gremlin
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/bb9738f2/conf/log4j2.xml
----------------------------------------------------------------------
diff --git a/conf/log4j2.xml b/conf/log4j2.xml
index f96ecf1..cc67a90 100644
--- a/conf/log4j2.xml
+++ b/conf/log4j2.xml
@@ -1,5 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+
<Configuration status="INFO">
<Appenders>
<Console name="console" target="SYSTEM_ERR">
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/bb9738f2/s2rest_play/conf/log4j.properties
----------------------------------------------------------------------
diff --git a/s2rest_play/conf/log4j.properties b/s2rest_play/conf/log4j.properties
deleted file mode 120000
index 41f51f3..0000000
--- a/s2rest_play/conf/log4j.properties
+++ /dev/null
@@ -1 +0,0 @@
-../../conf/log4j.properties
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/bb9738f2/s2rest_play/conf/log4j2.xml
----------------------------------------------------------------------
diff --git a/s2rest_play/conf/log4j2.xml b/s2rest_play/conf/log4j2.xml
new file mode 120000
index 0000000..dc34736
--- /dev/null
+++ b/s2rest_play/conf/log4j2.xml
@@ -0,0 +1 @@
+../../conf/log4j2.xml
\ No newline at end of file