Repository: incubator-metron Updated Branches: refs/heads/master 1097f3613 -> a12faeb0e
METRON-740: Normalizing and adding log4j properties override where possible. closes apache/incubator-metron#464 Project: http://git-wip-us.apache.org/repos/asf/incubator-metron/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-metron/commit/a12faeb0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-metron/tree/a12faeb0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-metron/diff/a12faeb0 Branch: refs/heads/master Commit: a12faeb0eafc4e10c79975160c55686ba2b7fd19 Parents: 1097f36 Author: cstella <ceste...@gmail.com> Authored: Mon Feb 27 09:01:07 2017 -0500 Committer: cstella <ceste...@gmail.com> Committed: Mon Feb 27 09:01:07 2017 -0500 ---------------------------------------------------------------------- metron-analytics/metron-maas-service/README.md | 3 ++- .../main/java/org/apache/metron/maas/service/Client.java | 4 ++-- .../org/apache/metron/maas/submit/ModelSubmission.java | 11 +++++++++++ .../apache/metron/maas/service/MaasIntegrationTest.java | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a12faeb0/metron-analytics/metron-maas-service/README.md ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/README.md b/metron-analytics/metron-maas-service/README.md index dd55558..6b1663b 100644 --- a/metron-analytics/metron-maas-service/README.md +++ b/metron-analytics/metron-maas-service/README.md @@ -43,7 +43,7 @@ usage: MaaSClient -h,--help This screen -j,--jar <arg> Jar file containing the application master - -l4j,--log_properties <arg> log4j.properties file + -l,--log4j <arg> The log4j properties file to load -ma,--modify_acls <arg> Users and groups that allowed to modify the timeline entities in the given domain @@ -85,6 +85,7 @@ usage: ModelSubmission -h,--help This screen -hmp,--hdfs_model_path <arg> Model Path (HDFS) -lmp,--local_model_path <arg> Model Path (local) + -l,--log4j <arg> The log4j properties file to load -m,--memory <arg> Memory for container -mo,--mode <arg> ADD, LIST or REMOVE -n,--name <arg> Model Name http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a12faeb0/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/Client.java ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/Client.java b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/Client.java index 601f21d..c2d8906 100644 --- a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/Client.java +++ b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/service/Client.java @@ -254,8 +254,8 @@ public class Client { o.setRequired(false); return o; }) - ,LOG4J_PROPERTIES("l4j", code -> { - Option o = new Option(code, "log_properties", true,"log4j.properties file"); + ,LOG4J_PROPERTIES("l", code -> { + Option o = new Option(code, "log4j", true, "The log4j properties file to load"); o.setRequired(false); return o; }) http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a12faeb0/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/submit/ModelSubmission.java ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/submit/ModelSubmission.java b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/submit/ModelSubmission.java index 885ca0f..ebfa904 100644 --- a/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/submit/ModelSubmission.java +++ b/metron-analytics/metron-maas-service/src/main/java/org/apache/metron/maas/submit/ModelSubmission.java @@ -30,8 +30,10 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.log4j.PropertyConfigurator; import org.apache.metron.maas.config.*; import org.apache.metron.maas.discovery.ServiceDiscoverer; +import org.apache.metron.maas.service.Log4jPropertyHelper; import org.apache.metron.maas.util.ConfigUtil; import org.apache.metron.maas.queue.Queue; import org.apache.metron.maas.queue.ZKQueue; @@ -98,6 +100,12 @@ public class ModelSubmission { o.setRequired(true); return o; }) + ,LOG4J_PROPERTIES("l", code -> { + Option o = new Option(code, "log4j", true, "The log4j properties file to load"); + o.setArgName("FILE"); + o.setRequired(false); + return o; + }) ; Option option; String shortCode; @@ -168,6 +176,9 @@ public class ModelSubmission { public void execute(FileSystem fs, String... argv) throws Exception { CommandLine cli = ModelSubmissionOptions.parse(new PosixParser(), argv); + if(ModelSubmissionOptions.LOG4J_PROPERTIES.has(cli)) { + Log4jPropertyHelper.updateLog4jConfiguration(ModelSubmission.class, ModelSubmissionOptions.LOG4J_PROPERTIES.get(cli)); + } ModelRequest request = null; CuratorFramework client = null; try { http://git-wip-us.apache.org/repos/asf/incubator-metron/blob/a12faeb0/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java ---------------------------------------------------------------------- diff --git a/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java b/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java index bab36ae..221a840 100644 --- a/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java +++ b/metron-analytics/metron-maas-service/src/test/java/org/apache/metron/maas/service/MaasIntegrationTest.java @@ -209,6 +209,7 @@ public class MaasIntegrationTest { "--num_instances", "1", "--memory", "100", "--mode", "ADD", + "--log4j", "src/test/resources/log4j.properties" }); ServiceDiscoverer discoverer = new ServiceDiscoverer(this.client, config.getServiceRoot());
