[incubator-nemo] branch master updated: [NEMO-113] Update README (#70)

[ja...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jangho pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nemo.git


The following commit(s) were added to refs/heads/master by this push:
     new 100224c  [NEMO-113] Update README (#70)
100224c is described below

commit 100224cd0d504164fe4cc80df0d92763d42c5f29
Author: Jeongyoon Eo <je...@gmail.com>
AuthorDate: Fri Jul 6 20:05:54 2018 +0900

    [NEMO-113] Update README (#70)
    
    JIRA: [NEMO-113: Update README](https://issues.apache.org/jira/projects/NEMO/issues/NEMO-113)
    
    **Major changes:**
    - Fixed resource json file name
    - Properly located log4j setting file
    
    **Minor changes to note:**
    N/A
    
    **Tests for the changes:**
    N/A
    
    **Other comments:**
    N/A
    
    resolves [NEMO-113](https://issues.apache.org/jira/projects/NEMO/issues/NEMO-113)
---
 README.md        |  4 ++--
 log4j.properties | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9295593..131bd21 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ Please refer to the [Contribution guideline](.github/CONTRIBUTING.md) to contrib
 ## MapReduce example
 ./bin/run_beam.sh \
 	-job_id mr_default \
-	-executor_json `pwd`/examples/resources/sample_executor_resources.json \
+	-executor_json `pwd`/examples/resources/beam_sample_executor_resources.json \
 	-optimization_policy edu.snu.nemo.compiler.optimizer.policy.DefaultPolicy \
 	-user_main edu.snu.nemo.examples.beam.WordCount \
 	-user_args "`pwd`/examples/resources/sample_input_wordcount `pwd`/examples/resources/sample_output_wordcount"
@@ -86,7 +86,7 @@ Please refer to the [Contribution guideline](.github/CONTRIBUTING.md) to contrib
 ./bin/run_beam.sh \
 	-deploy_mode yarn \
   	-job_id mr_pado \
-	-executor_json `pwd`/examples/resources/sample_executor_resources.json \
+	-executor_json `pwd`/examples/resources/beam_sample_executor_resources.json \
   	-user_main edu.snu.nemo.examples.beam.WordCount \
   	-optimization_policy edu.snu.nemo.compiler.optimizer.policy.PadoPolicy \
   	-user_args "hdfs://v-m:9000/sample_input_wordcount hdfs://v-m:9000/sample_output_wordcount"
diff --git a/log4j.properties b/log4j.properties
new file mode 100644
index 0000000..55bcb79
--- /dev/null
+++ b/log4j.properties
@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2018 Seoul National University
+# 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.
+#
+log4j.rootLogger=INFO, STDOUT
+
+log4j.logger.edu.snu.nemo.runtime.master.MetricManagerMaster=INFO, METRIC
+log4j.additivity.edu.snu.nemo.runtime.master.MetricManagerMaster=false
+
+log4j.appender.STDOUT=org.apache.log4j.ConsoleAppender
+log4j.appender.STDOUT.layout=org.apache.log4j.PatternLayout
+log4j.appender.STDOUT.layout.ConversionPattern=%5p %d{MM-dd HH:mm:ss,SSS} %C{1}:%L [%t] - %m%n
+
+log4j.appender.METRIC=org.apache.log4j.FileAppender
+log4j.appender.METRIC.File=metric.log
+log4j.appender.METRIC.layout=org.apache.log4j.PatternLayout
+log4j.appender.METRIC.layout.ConversionPattern=%5p %d{MM-dd HH:mm:ss,SSS} %C{1}:%L [%t] - %m%n
+
+
+# Sample appender
+#log4j.appender.file=org.apache.log4j.RollingFileAppender
+#log4j.appender.file.File=.\\logging.log
+#log4j.appender.file.layout=org.apache.log4j.PatternLayout
+#log4j.appender.file.layout.ConversionPattern=%5p %d{MM-dd HH:mm:ss,SSS} %C{1}:%L [%t] - %m%n