ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-5239 Added full stacktrace.
Date Tue, 13 Jun 2017 04:31:36 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5239 de4b69cf9 -> b6f40a1dd


IGNITE-5239 Added full stacktrace.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b6f40a1d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6f40a1d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6f40a1d

Branch: refs/heads/ignite-5239
Commit: b6f40a1dd3c390b7599fa51ef5973659ebe7077b
Parents: de4b69c
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Tue Jun 13 11:31:53 2017 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Tue Jun 13 11:31:53 2017 +0700

----------------------------------------------------------------------
 .../http/jetty/GridJettyObjectMapper.java         |  9 ++-------
 .../frontend/app/modules/sql/sql.controller.js    | 18 ++++++++----------
 .../console/agent/handlers/ClusterListener.java   |  5 ++++-
 3 files changed, 14 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f40a1d/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java
b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java
index 9f217c6..5dbb32f 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyObjectMapper.java
@@ -159,13 +159,8 @@ public class GridJettyObjectMapper extends ObjectMapper {
             if (!F.isEmpty(e.getSuppressed())) {
                 gen.writeArrayFieldStart("suppressed");
 
-                for (Throwable sup : e.getSuppressed()) {
-                    gen.writeStartObject();
-
-                    writeException(sup, gen);
-
-                    gen.writeEndObject();
-                }
+                for (Throwable sup : e.getSuppressed())
+                    gen.writeObject(sup);
 
                 gen.writeEndArray();
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f40a1d/modules/web-console/frontend/app/modules/sql/sql.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/sql/sql.controller.js b/modules/web-console/frontend/app/modules/sql/sql.controller.js
index f0dc0b1..7101a96 100644
--- a/modules/web-console/frontend/app/modules/sql/sql.controller.js
+++ b/modules/web-console/frontend/app/modules/sql/sql.controller.js
@@ -1774,23 +1774,21 @@ export default ['$rootScope', '$scope', '$http', '$q', '$timeout',
'$interval',
                 scope.title = 'Error details';
                 scope.content = [];
 
-                let cause = paragraph.error.root;
-
                 const tab = '&nbsp;&nbsp;&nbsp;&nbsp;';
 
                 const addToTrace = (item) => {
-                    const clsName = _.isEmpty(item.className) ? '' : '[' + JavaTypes.shortClassName(item.className)
+ '] ';
+                    if (_.nonNil(item)) {
+                        const clsName = _.isEmpty(item.className) ? '' : '[' + JavaTypes.shortClassName(item.className)
+ '] ';
 
-                    scope.content.push((scope.content.length > 0 ? tab : '') + clsName
+ item.message);
-                };
+                        scope.content.push((scope.content.length > 0 ? tab : '') + clsName
+ item.message);
 
-                while (_.nonNil(cause)) {
-                    addToTrace(cause);
+                        addToTrace(item.cause);
 
-                    _.forEach(cause.suppressed, (sup) => addToTrace(sup));
+                        _.forEach(item.suppressed, (sup) => addToTrace(sup));
+                    }
+                };
 
-                    cause = cause.cause;
-                }
+                addToTrace(paragraph.error.root);
 
                 // Show a basic modal from a controller
                 $modal({scope, templateUrl: messageTemplateUrl, show: true});

http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f40a1d/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
index cde4701..b811a2d 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/ClusterListener.java
@@ -21,7 +21,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.socket.client.Socket;
 import io.socket.emitter.Emitter;
-import java.io.IOException;
+import java.net.ConnectException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -270,6 +270,9 @@ public class ClusterListener {
                         clusterDisconnect();
                 }
             }
+            catch (ConnectException ignored) {
+                clusterDisconnect();
+            }
             catch (Exception e) {
                 log.error("WatchTask failed", e);
 


Mime
View raw message