[incubator-sdap-mudrod] branch master updated: SDAP-165 Fix MUDROD bugs to get master branch running(#34)

[fgreg]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 50997e7  SDAP-165 Fix MUDROD bugs to get master branch running(#34)
50997e7 is described below

commit 50997e7c2e6af7512aed665c356845e6c0a98b1e
Author: echyam <ech...@users.noreply.github.com>
AuthorDate: Wed Nov 7 10:39:40 2018 -0800

    SDAP-165 Fix MUDROD bugs to get master branch running(#34)
    
    * missing import statement on test
    * stop printing cli options in middle of exception
    * expected log prefixes start with ssl_
---
 core/src/main/java/org/apache/sdap/mudrod/main/MudrodEngine.java    | 2 +-
 core/src/main/resources/config.properties                           | 6 +++---
 .../apache/sdap/mudrod/weblog/structure/TestApacheAccessLog.java    | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/org/apache/sdap/mudrod/main/MudrodEngine.java 
b/core/src/main/java/org/apache/sdap/mudrod/main/MudrodEngine.java
index 0efd3ee..48218e9 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/main/MudrodEngine.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/main/MudrodEngine.java
@@ -391,7 +391,7 @@ public class MudrodEngine {
       me.end();
     } catch (Exception e) {
       HelpFormatter formatter = new HelpFormatter();
-      formatter.printHelp("MudrodEngine: 'dataDir' argument is mandatory. " + 
"User must also provide an ingest method.", options, true);
+      formatter.printHelp("MudrodEngine: 'dataDir' argument is mandatory. " + 
"User must also provide an ingest method.", true);
       LOG.error("Error whilst parsing command line.", e);
     }
   }
diff --git a/core/src/main/resources/config.properties 
b/core/src/main/resources/config.properties
index 5ed2504..0b45990 100644
--- a/core/src/main/resources/config.properties
+++ b/core/src/main/resources/config.properties
@@ -27,8 +27,8 @@ mudrod.spark.optimize = repartition
 # Web log processing configuration
 # index name has to be all lowercase
 mudrod.log.index = log
-mudrod.ftp.prefix = FTP.
-mudrod.http.prefix = WWW.
+mudrod.ftp.prefix = ssl_FTP.
+mudrod.http.prefix = ssl_WWW.
 mudrod.base.url = http://podaac.jpl.nasa.gov/
 mudrod.black.request.list = .js, .css, .jpg, .png, .ico, image_captcha, 
autocomplete, .gif, /alldata/, /api/, get / http/1.1, .jpeg, /ws/
 mudrod.black.agent.list = crawler, googlebot, bingbot, slurp, yacybot, 
rogerbot, yandexbot, -, apache-httpclient, java, curl
@@ -77,4 +77,4 @@ mudrod.metadata.semantic.fields = 
DatasetParameter-Term,DatasetParameter-Variabl
 
 # ontology service implementation. Possible values include EsipPortal - 
EsipPortalOntology EsipCOR - EsipCOROntology Local - 
org.apache.sdap.mudrod.ontology.process.Local
 mudrod.ontology.implementation = Local
-mudrod.ontology.weight = 2
\ No newline at end of file
+mudrod.ontology.weight = 2
diff --git 
a/core/src/test/java/org/apache/sdap/mudrod/weblog/structure/TestApacheAccessLog.java
 
b/core/src/test/java/org/apache/sdap/mudrod/weblog/structure/TestApacheAccessLog.java
index e1453a5..b4aebed 100644
--- 
a/core/src/test/java/org/apache/sdap/mudrod/weblog/structure/TestApacheAccessLog.java
+++ 
b/core/src/test/java/org/apache/sdap/mudrod/weblog/structure/TestApacheAccessLog.java
@@ -23,6 +23,7 @@ import java.io.InputStream;
 import java.net.URL;
 import java.text.ParseException;
 import java.util.Properties;
+import org.apache.sdap.mudrod.weblog.structure.log.ApacheAccessLog;
 
 import static org.junit.Assert.assertNotEquals;