You are viewing a plain text version of this content. The canonical link for it is here.
Posted to submarine-dev@hadoop.apache.org by li...@apache.org on 2019/10/06 07:51:54 UTC
[hadoop-submarine] branch master updated: [SUBMARINE-206] Allow to
add properties files
This is an automated email from the ASF dual-hosted git repository.
liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 300648d [SUBMARINE-206] Allow to add properties files
300648d is described below
commit 300648df4241d69590404f4de6f4d8f0d8acad89
Author: Linhao Zhu <zh...@gmail.com>
AuthorDate: Mon Sep 30 16:16:38 2019 +0800
[SUBMARINE-206] Allow to add properties files
### What is this PR for?
1. The ".gitignore" file contains "*.properties", The file with the ".properties" suffix cannot be uploaded, Such as log4j properties.
2. workbench-server project and hadoop-submarine/conf ,The log configuration file needs to be provided.
### What type of PR is it?
[Bug Fix ]
### Todos
* [ ] - Task
### What is the Jira issue?
* [SUBMARINE-206](https://issues.apache.org/jira/browse/SUBMARINE-206)
### How should this be tested?
* [CI Pass](https://travis-ci.org/LinhaoZhu/hadoop-submarine/builds/591377170)
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Linhao Zhu <zh...@gmail.com>
Author: LinhaoZhu <zh...@163.com>
Closes #25 from LinhaoZhu/SUBMARINE-206 and squashes the following commits:
85ecacd [LinhaoZhu] [SUBMARINE-206] Add log4j.properties
394ead6 [LinhaoZhu] Merge branch 'master' of https://github.com/LinhaoZhu/hadoop-submarine
e960433 [Linhao Zhu] Merge pull request #4 from apache/master
8380fef [LinhaoZhu] Merge branch 'master' of https://github.com/apache/hadoop-submarine
787c1e4 [Linhao Zhu] Merge pull request #3 from apache/master
5dd7e69 [Linhao Zhu] Merge pull request #2 from apache/master
d70f4ad [Linhao Zhu] Merge pull request #1 from apache/master
---
.gitignore | 1 -
conf/log4j.properties | 17 +++++++++++++++++
.../src/main/resources/log4j.properties | 17 +++++++++++++++++
3 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index b8552dd..3ffe165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ venv.bak/
.DS_Store
.idea
*.iml
-*.properties
*.gradle
*.tgz
*.tar.gz
diff --git a/conf/log4j.properties b/conf/log4j.properties
new file mode 100644
index 0000000..55e02b6
--- /dev/null
+++ b/conf/log4j.properties
@@ -0,0 +1,17 @@
+# Licensed 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. See accompanying LICENSE file.
+log4j.rootLogger = info, stdout
+
+log4j.appender.stdout = org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target = System.out
+log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n
diff --git a/submarine-workbench/workbench-server/src/main/resources/log4j.properties b/submarine-workbench/workbench-server/src/main/resources/log4j.properties
new file mode 100644
index 0000000..55e02b6
--- /dev/null
+++ b/submarine-workbench/workbench-server/src/main/resources/log4j.properties
@@ -0,0 +1,17 @@
+# Licensed 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. See accompanying LICENSE file.
+log4j.rootLogger = info, stdout
+
+log4j.appender.stdout = org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target = System.out
+log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern = [%-5p] %d{yyyy-MM-dd HH:mm:ss,SSS} method:%l%n%m%n