[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 <[email protected]> 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 <[email protected]> Authored: Tue Mar 27 11:31:37 2018 +0900 Committer: daewon <[email protected]> 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
