You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sdap.apache.org by le...@apache.org on 2019/08/07 16:39:40 UTC
[incubator-sdap-mudrod] branch master updated: SDAP-200 Loggers
used instead to print Throwable. (#48)
This is an automated email from the ASF dual-hosted git repository.
lewismc 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 984ab07 SDAP-200 Loggers used instead to print Throwable. (#48)
984ab07 is described below
commit 984ab0751dfdc5cd7844d1d8c1f6beecb26d554c
Author: Furkan KAMACI <fu...@gmail.com>
AuthorDate: Wed Aug 7 19:39:36 2019 +0300
SDAP-200 Loggers used instead to print Throwable. (#48)
* SDAP-200 Loggers used instead to print Throwable.
* SDAP-200 Loggers used instead to print Throwable.
---
.../mudrod/metadata/process/MetadataAnalyzer.java | 2 +-
.../sdap/mudrod/ontology/pre/AggregateTriples.java | 4 ++--
.../mudrod/ontology/process/OntologyLinkCal.java | 20 +++++++++++---------
.../process/FeatureBasedSimilarity.java | 6 +++---
.../structure/HybridRecommendation.java | 6 +++++-
.../mudrod/ssearch/ranking/TrainingImporter.java | 8 ++++++--
.../org/apache/sdap/mudrod/tools/EONETIngester.java | 2 +-
.../sdap/mudrod/weblog/structure/log/RequestUrl.java | 6 ++----
.../mudrod/weblog/structure/session/SessionNode.java | 6 +++++-
9 files changed, 36 insertions(+), 24 deletions(-)
diff --git a/core/src/main/java/org/apache/sdap/mudrod/metadata/process/MetadataAnalyzer.java b/core/src/main/java/org/apache/sdap/mudrod/metadata/process/MetadataAnalyzer.java
index 7dc72c5..d579870 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/metadata/process/MetadataAnalyzer.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/metadata/process/MetadataAnalyzer.java
@@ -77,7 +77,7 @@ public class MetadataAnalyzer extends DiscoveryStepAbstract implements Serializa
analyzer.saveToES(triples, props.getProperty(MudrodConstants.ES_INDEX_NAME), MudrodConstants.METADATA_LINKAGE_TYPE);
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error("Error whilst executing metadata analyzer!", e);
}
endTime = System.currentTimeMillis();
diff --git a/core/src/main/java/org/apache/sdap/mudrod/ontology/pre/AggregateTriples.java b/core/src/main/java/org/apache/sdap/mudrod/ontology/pre/AggregateTriples.java
index 91fb5db..3bd2219 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/ontology/pre/AggregateTriples.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/ontology/pre/AggregateTriples.java
@@ -73,12 +73,12 @@ public class AggregateTriples extends DiscoveryStepAbstract {
loadXml(fileIn.getAbsolutePath());
getAllClass();
} catch (JDOMException | IOException e1) {
- LOG.error("Couln't load Owl file into memory: ", e1);
+ LOG.error("Couldn't load Owl file into memory: ", e1);
}
}
}
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error("Couldn't open file!", e);
}
return null;
diff --git a/core/src/main/java/org/apache/sdap/mudrod/ontology/process/OntologyLinkCal.java b/core/src/main/java/org/apache/sdap/mudrod/ontology/process/OntologyLinkCal.java
index 59b9aaa..d0a21d9 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/ontology/process/OntologyLinkCal.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/ontology/process/OntologyLinkCal.java
@@ -20,6 +20,8 @@ import org.apache.sdap.mudrod.main.MudrodConstants;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.QueryBuilders;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.FileInputStream;
@@ -37,6 +39,8 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
*/
public class OntologyLinkCal extends DiscoveryStepAbstract {
+ private static final Logger LOG = LoggerFactory.getLogger(OntologyLinkCal.class);
+
public OntologyLinkCal(Properties props, ESDriver es, SparkDriver spark) {
super(props, es, spark);
es.deleteAllByQuery(props.getProperty(MudrodConstants.ES_INDEX_NAME), MudrodConstants.ONTOLOGY_LINKAGE_TYPE, QueryBuilders.matchAllQuery());
@@ -57,7 +61,7 @@ public class OntologyLinkCal extends DiscoveryStepAbstract {
es.getClient().admin().indices().preparePutMapping(props.getProperty(MudrodConstants.ES_INDEX_NAME))
.setType(MudrodConstants.ONTOLOGY_LINKAGE_TYPE).setSource(Mapping).execute().actionGet();
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error("Adding mapping is failed!", e);
}
}
@@ -90,13 +94,11 @@ public class OntologyLinkCal extends DiscoveryStepAbstract {
}
- } catch (IOException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- Thread.currentThread().interrupt();
- } catch (ExecutionException e) {
- e.printStackTrace();
+ } catch (IOException | ExecutionException | InterruptedException e) {
+ LOG.error("Couldn't open file!", e);
+ if (e instanceof InterruptedException) {
+ Thread.currentThread().interrupt();
+ }
} finally {
if (br != null) {
try {
@@ -104,7 +106,7 @@ public class OntologyLinkCal extends DiscoveryStepAbstract {
es.destroyBulkProcessor();
es.refreshIndex();
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error("Error whilst closing file!", e);
}
}
}
diff --git a/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/FeatureBasedSimilarity.java b/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/FeatureBasedSimilarity.java
index 3e03db5..bad2f26 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/FeatureBasedSimilarity.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/recommendation/process/FeatureBasedSimilarity.java
@@ -147,8 +147,8 @@ public class FeatureBasedSimilarity extends DiscoveryStepAbstract implements Ser
IndexRequest ir = new IndexRequest(indexName, variableSimType).source(contentBuilder);
es.getBulkProcessor().add(ir);
- } catch (IOException e1) {
- e1.printStackTrace();
+ } catch (IOException e) {
+ LOG.error("Indexing feature similarity is failed!", e);
}
}
@@ -167,7 +167,7 @@ public class FeatureBasedSimilarity extends DiscoveryStepAbstract implements Ser
es.getClient().admin().indices().preparePutMapping(index).setType(type).setSource(Mapping).execute().actionGet();
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error("Adding mapping is failed!", e);
}
}
diff --git a/core/src/main/java/org/apache/sdap/mudrod/recommendation/structure/HybridRecommendation.java b/core/src/main/java/org/apache/sdap/mudrod/recommendation/structure/HybridRecommendation.java
index 6722e82..98f2235 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/recommendation/structure/HybridRecommendation.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/recommendation/structure/HybridRecommendation.java
@@ -27,6 +27,8 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.sort.SortOrder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.text.DecimalFormat;
@@ -50,6 +52,8 @@ public class HybridRecommendation extends DiscoveryStepAbstract {
private static final String INDEX_NAME = MudrodConstants.ES_INDEX_NAME;
private static final String WEIGHT = "weight";
+ private static final Logger LOG = LoggerFactory.getLogger(HybridRecommendation.class);
+
/**
* recommended data class Date: Sep 12, 2016 2:25:28 AM
*/
@@ -192,7 +196,7 @@ public class HybridRecommendation extends DiscoveryStepAbstract {
sortedMap = sortMapByValue(termsMap); // terms_map will be empty
} catch (Exception e) {
- e.printStackTrace();
+ LOG.error("Getting recommend dataset is failed!", e);
}
return sortedMap;
diff --git a/core/src/main/java/org/apache/sdap/mudrod/ssearch/ranking/TrainingImporter.java b/core/src/main/java/org/apache/sdap/mudrod/ssearch/ranking/TrainingImporter.java
index f98ed0a..9838256 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/ssearch/ranking/TrainingImporter.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/ssearch/ranking/TrainingImporter.java
@@ -20,6 +20,8 @@ import org.apache.sdap.mudrod.main.MudrodConstants;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.query.QueryBuilders;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.File;
@@ -40,6 +42,8 @@ public class TrainingImporter extends MudrodAbstract {
*/
private static final long serialVersionUID = 1L;
+ private static final Logger LOG = LoggerFactory.getLogger(TrainingImporter.class);
+
public TrainingImporter(Properties props, ESDriver es, SparkDriver spark) {
super(props, es, spark);
es.deleteAllByQuery(props.getProperty(MudrodConstants.ES_INDEX_NAME), "trainingranking", QueryBuilders.matchAllQuery());
@@ -47,7 +51,7 @@ public class TrainingImporter extends MudrodAbstract {
}
/**
- * Method of adding mapping to traning set type
+ * Method of adding mapping to training set type
*/
private void addMapping() {
XContentBuilder Mapping;
@@ -58,7 +62,7 @@ public class TrainingImporter extends MudrodAbstract {
es.getClient().admin().indices().preparePutMapping(props.getProperty(MudrodConstants.ES_INDEX_NAME)).setType("trainingranking").setSource(Mapping).execute().actionGet();
} catch (IOException e) {
- e.printStackTrace();
+ LOG.error("Adding mapping to training set type is failed!", e);
}
}
diff --git a/core/src/main/java/org/apache/sdap/mudrod/tools/EONETIngester.java b/core/src/main/java/org/apache/sdap/mudrod/tools/EONETIngester.java
index 796cefa..17f2bfe 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/tools/EONETIngester.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/tools/EONETIngester.java
@@ -99,7 +99,7 @@ public class EONETIngester extends MudrodAbstract {
try {
result = executeBulkIndexRequest(mEngine, esDriver, executeEonetGetOperations());
} catch (SSLHandshakeException e) {
- e.printStackTrace();
+ LOG.error("SSL handshake is failed whilst acquiring all events!", e);
}
if (result != null) {
return result;
diff --git a/core/src/main/java/org/apache/sdap/mudrod/weblog/structure/log/RequestUrl.java b/core/src/main/java/org/apache/sdap/mudrod/weblog/structure/log/RequestUrl.java
index 90bc1f6..895f792 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/weblog/structure/log/RequestUrl.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/weblog/structure/log/RequestUrl.java
@@ -142,8 +142,7 @@ public class RequestUrl {
keyword = keyword.replaceAll("[-+^:,*_\"]", " ").replace("\\", " ").replaceAll("\\s+", " ").trim();
} catch (UnsupportedEncodingException e) {
- LOG.error(mapRequest.get("search"));
- e.printStackTrace();
+ LOG.error(mapRequest.get("search"), e);
}
if (!"".equals(keyword)) {
info.add(keyword);
@@ -176,8 +175,7 @@ public class RequestUrl {
info.add(item);
}
} catch (Exception e) {
- LOG.error(values[i]);
- e.printStackTrace();
+ LOG.error(values[i], e);
}
}
diff --git a/core/src/main/java/org/apache/sdap/mudrod/weblog/structure/session/SessionNode.java b/core/src/main/java/org/apache/sdap/mudrod/weblog/structure/session/SessionNode.java
index ee8579c..aec115a 100644
--- a/core/src/main/java/org/apache/sdap/mudrod/weblog/structure/session/SessionNode.java
+++ b/core/src/main/java/org/apache/sdap/mudrod/weblog/structure/session/SessionNode.java
@@ -27,6 +27,8 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.sdap.mudrod.main.MudrodConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* ClassName: SessionNode Function: Functions related to a node in a session
@@ -61,6 +63,8 @@ public class SessionNode {
// datasetId: viewed/downloaded data set ID
protected String datasetId;
+ private static final Logger LOG = LoggerFactory.getLogger(SessionNode.class);
+
public SessionNode() {
}
@@ -343,7 +347,7 @@ public class SessionNode {
try {
request = URLDecoder.decode(request, "UTF-8");
} catch (UnsupportedEncodingException e) {
- e.printStackTrace();
+ LOG.error("Parsing request to extract data set ID is failed!", e);
}
String[] twoparts = request.split("[?]");
String[] parts = twoparts[0].split("/");