You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/10/16 12:37:01 UTC
[1/3] ignite git commit: IGNITE-1660 Add jdbc error logging.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 58bc59816 -> e4078904f
IGNITE-1660 Add jdbc error logging.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6cae5c55
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6cae5c55
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6cae5c55
Branch: refs/heads/ignite-843-rc1
Commit: 6cae5c55689e936b045d6d665f11ec061ff54087
Parents: c865503
Author: Andrey <an...@gridgain.com>
Authored: Fri Oct 16 09:11:08 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Oct 16 09:54:50 2015 +0700
----------------------------------------------------------------------
.../ignite/agent/handlers/DatabaseMetadataExtractor.java | 10 ++++++++++
.../src/main/resources/logging.properties | 1 +
2 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6cae5c55/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
index 2c9037f..4fa7119 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/handlers/DatabaseMetadataExtractor.java
@@ -92,6 +92,11 @@ public class DatabaseMetadataExtractor {
return schemas;
}
+ catch (SQLException e) {
+ log.log(Level.SEVERE, "Failed to collect schemas", e);
+
+ throw e;
+ }
}
/**
@@ -116,6 +121,11 @@ public class DatabaseMetadataExtractor {
return metadata;
}
+ catch (SQLException e) {
+ log.log(Level.SEVERE, "Failed to collect metadata", e);
+
+ throw e;
+ }
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/6cae5c55/modules/control-center-agent/src/main/resources/logging.properties
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/resources/logging.properties b/modules/control-center-agent/src/main/resources/logging.properties
index eb80de5..e262eb8 100644
--- a/modules/control-center-agent/src/main/resources/logging.properties
+++ b/modules/control-center-agent/src/main/resources/logging.properties
@@ -19,6 +19,7 @@ handlers=java.util.logging.ConsoleHandler, java.util.logging.FileHandler
org.apache.http.level=INFO
org.apache.commons.beanutils.level=INFO
+sun.net.www.protocol.http.level=INFO
java.util.logging.ConsoleHandler.formatter=org.apache.ignite.logger.java.JavaLoggerFormatter
java.util.logging.ConsoleHandler.level=INFO
[3/3] ignite git commit: IGNITE-843 Hide token
Posted by an...@apache.org.
IGNITE-843 Hide token
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4078904
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4078904
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4078904
Branch: refs/heads/ignite-843-rc1
Commit: e4078904f2ef611d1dd0fb1030b7c281023a24f1
Parents: 8c176b4
Author: Andrey <an...@gridgain.com>
Authored: Fri Oct 16 17:36:19 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Oct 16 17:36:19 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/agent/AgentConfiguration.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4078904/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
index f13e183..87d0cdf 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentConfiguration.java
@@ -259,8 +259,19 @@ public class AgentConfiguration {
@Override public String toString() {
StringBuilder sb = new StringBuilder();
- if (tok != null)
- sb.append("User's security token : ").append(token()).append('\n');
+ if (tok != null && tok.length() > 0) {
+ sb.append("User's security token : ");
+
+ if (tok.length() > 4) {
+ sb.append(new String(new char[tok.length() - 4]).replace("\0", "*"));
+
+ sb.append(tok.substring(tok.length() - 4));
+ }
+ else
+ sb.append(new String(new char[tok.length()]).replace("\0", "*"));
+
+ sb.append('\n');
+ }
sb.append("URI to Ignite node REST server: ").append(nodeUri == null ? DFLT_NODE_URI : nodeUri).append('\n');
sb.append("URI to Ignite Console server : ").append(srvUri == null ? DFLT_SERVER_URI : srvUri).append('\n');
[2/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc1' into ignite-843-rc1
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8c176b43
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8c176b43
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8c176b43
Branch: refs/heads/ignite-843-rc1
Commit: 8c176b43785db675535795d3307a0249386d6895
Parents: 6cae5c5 58bc598
Author: Andrey <an...@gridgain.com>
Authored: Fri Oct 16 17:10:32 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Oct 16 17:10:32 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 105 +++++++++++++++----
.../main/js/controllers/metadata-controller.js | 77 ++++++++------
.../src/main/js/controllers/sql-controller.js | 2 +-
.../src/main/js/routes/agent.js | 6 ++
.../js/views/configuration/metadata-load.jade | 2 +
.../main/js/views/templates/agent-download.jade | 3 +-
6 files changed, 138 insertions(+), 57 deletions(-)
----------------------------------------------------------------------