You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2017/09/13 12:53:10 UTC
ignite git commit: IGNITE-6002 Make log message more pretty when
instance name is null
Repository: ignite
Updated Branches:
refs/heads/master 4af18327b -> 60d758820
IGNITE-6002 Make log message more pretty when instance name is null
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60d75882
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60d75882
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60d75882
Branch: refs/heads/master
Commit: 60d758820486273ab701185af6f533d66d13e0b4
Parents: 4af1832
Author: Kousuke Saruta <sa...@oss.nttdata.co.jp>
Authored: Wed Sep 13 15:53:00 2017 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 13 15:53:00 2017 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 3 ++-
.../core/src/main/java/org/apache/ignite/thread/IgniteThread.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/60d75882/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index f4b180c..3922b39 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1254,7 +1254,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
String msg = NL +
"Metrics for local node (to disable set 'metricsLogFrequency' to 0)" + NL +
- " ^-- Node [id=" + id + ", name=" + name() + ", uptime=" + getUpTimeFormatted() + "]" + NL +
+ " ^-- Node [id=" + id + (name() != null ? ", name=" + name() : "") + ", uptime=" +
+ getUpTimeFormatted() + "]" + NL +
" ^-- H/N/C [hosts=" + hosts + ", nodes=" + nodes + ", CPUs=" + cpus + "]" + NL +
" ^-- CPU [cur=" + dblFmt.format(cpuLoadPct) + "%, avg=" +
dblFmt.format(avgCpuLoadPct) + "%, GC=" + dblFmt.format(gcPct) + "%]" + NL +
http://git-wip-us.apache.org/repos/asf/ignite/blob/60d75882/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
index b8a91a2..70b75e3 100644
--- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
+++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteThread.java
@@ -176,7 +176,7 @@ public class IgniteThread extends Thread {
* @return New thread name.
*/
protected static String createName(long num, String threadName, String igniteInstanceName) {
- return threadName + "-#" + num + '%' + igniteInstanceName + '%';
+ return threadName + "-#" + num + (igniteInstanceName != null ? '%' + igniteInstanceName + '%' : "");
}
/** {@inheritDoc} */