You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/11/30 16:09:41 UTC
[GitHub] peng-yongsheng closed pull request #1986: Print exception stack
into console or log files.
peng-yongsheng closed pull request #1986: Print exception stack into console or log files.
URL: https://github.com/apache/incubator-skywalking/pull/1986
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java
index ebec15fa1..3057dcf92 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/NetworkAddressInventoryCacheEsDAO.java
@@ -19,7 +19,7 @@
package org.apache.skywalking.oap.server.storage.plugin.elasticsearch.cache;
import org.apache.skywalking.oap.server.core.Const;
-import org.apache.skywalking.oap.server.core.register.*;
+import org.apache.skywalking.oap.server.core.register.NetworkAddressInventory;
import org.apache.skywalking.oap.server.core.storage.cache.INetworkAddressInventoryCacheDAO;
import org.apache.skywalking.oap.server.library.client.elasticsearch.ElasticSearchClient;
import org.apache.skywalking.oap.server.storage.plugin.elasticsearch.base.EsDAO;
@@ -52,8 +52,8 @@ public NetworkAddressInventoryCacheEsDAO(ElasticSearchClient client) {
} else {
return Const.NONE;
}
- } catch (Throwable e) {
- logger.error(e.getMessage());
+ } catch (Throwable t) {
+ logger.error(t.getMessage(), t);
return Const.NONE;
}
}
@@ -71,8 +71,8 @@ public NetworkAddressInventoryCacheEsDAO(ElasticSearchClient client) {
} else {
return null;
}
- } catch (Throwable e) {
- logger.error(e.getMessage());
+ } catch (Throwable t) {
+ logger.error(t.getMessage(), t);
return null;
}
}
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java
index 3abc5fbe8..fa1ae8782 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInstanceInventoryCacheDAO.java
@@ -56,8 +56,8 @@ public ServiceInstanceInventoryCacheDAO(ElasticSearchClient client) {
} else {
return null;
}
- } catch (Throwable e) {
- logger.error(e.getMessage());
+ } catch (Throwable t) {
+ logger.error(t.getMessage(), t);
return null;
}
}
@@ -80,8 +80,8 @@ private int get(String id) {
} else {
return Const.NONE;
}
- } catch (Throwable e) {
- logger.error(e.getMessage());
+ } catch (Throwable t) {
+ logger.error(t.getMessage(), t);
return Const.NONE;
}
}
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java
index e7e1ada27..b34ea8bca 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/cache/ServiceInventoryCacheEsDAO.java
@@ -63,8 +63,8 @@ private int get(String id) {
} else {
return Const.NONE;
}
- } catch (Throwable e) {
- logger.error(e.getMessage());
+ } catch (Throwable t) {
+ logger.error(t.getMessage(), t);
return Const.NONE;
}
}
@@ -82,8 +82,8 @@ private int get(String id) {
} else {
return null;
}
- } catch (Throwable e) {
- logger.error(e.getMessage());
+ } catch (Throwable t) {
+ logger.error(t.getMessage(), t);
return null;
}
}
@@ -106,8 +106,8 @@ private int get(String id) {
for (SearchHit searchHit : response.getHits().getHits()) {
serviceInventories.add(this.builder.map2Data(searchHit.getSourceAsMap()));
}
- } catch (Throwable e) {
- logger.error(e.getMessage());
+ } catch (Throwable t) {
+ logger.error(t.getMessage(), t);
}
return serviceInventories;
diff --git a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java
index cf59d0010..d76c650b0 100644
--- a/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java
+++ b/oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/lock/RegisterLockDAOImpl.java
@@ -89,7 +89,7 @@ private void lock(String id, int timeout, long version) throws IOException {
getClient().forceUpdate(RegisterLockIndex.NAME, id, source);
} catch (Throwable t) {
- logger.error("Release lock failure.");
+ logger.error("Release lock failure.", t);
}
}
}
diff --git a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java
index 20da50056..0334ed1ed 100644
--- a/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java
+++ b/oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2ServiceInventoryCacheDAO.java
@@ -19,17 +19,13 @@
package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao;
import java.io.IOException;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
+import java.sql.*;
+import java.util.*;
import org.apache.skywalking.oap.server.core.register.ServiceInventory;
import org.apache.skywalking.oap.server.core.storage.cache.IServiceInventoryCacheDAO;
import org.apache.skywalking.oap.server.library.client.jdbc.hikaricp.JDBCHikariCPClient;
import org.apache.skywalking.oap.server.library.util.BooleanUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.slf4j.*;
/**
* @author wusheng
@@ -82,8 +78,8 @@ public H2ServiceInventoryCacheDAO(JDBCHikariCPClient h2Client) {
} catch (SQLException e) {
throw new IOException(e);
}
- } catch (Throwable e) {
- logger.error(e.getMessage());
+ } catch (Throwable t) {
+ logger.error(t.getMessage(), t);
}
return serviceInventories;
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services