You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/08/31 07:26:23 UTC
[1/3] storm git commit: STORM-2063: allow default thread name in case
we don't have a better name for it, turn on %t in worker.xml by default
Repository: storm
Updated Branches:
refs/heads/1.0.x-branch 9ce36ad76 -> 106dfff61
STORM-2063: allow default thread name in case we don't have a better
name for it, turn on %t in worker.xml by default
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/54dd2a8f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/54dd2a8f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/54dd2a8f
Branch: refs/heads/1.0.x-branch
Commit: 54dd2a8f8fabb4d4a58034392717558d95b6a3de
Parents: 9ce36ad
Author: Alessandro Bellina <ab...@yahoo-inc.com>
Authored: Mon Aug 29 07:44:18 2016 -0500
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 31 16:25:27 2016 +0900
----------------------------------------------------------------------
log4j2/worker.xml | 2 +-
storm-core/src/clj/org/apache/storm/util.clj | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/54dd2a8f/log4j2/worker.xml
----------------------------------------------------------------------
diff --git a/log4j2/worker.xml b/log4j2/worker.xml
index a9aeaed..f1e23a1 100644
--- a/log4j2/worker.xml
+++ b/log4j2/worker.xml
@@ -18,7 +18,7 @@
<configuration monitorInterval="60">
<properties>
- <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} [%p] %msg%n</property>
+ <property name="pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} %c{1.} %t [%p] %msg%n</property>
<property name="patternNoTime">%msg%n</property>
<property name="patternMetrics">%d %-8r %m%n</property>
</properties>
http://git-wip-us.apache.org/repos/asf/storm/blob/54dd2a8f/storm-core/src/clj/org/apache/storm/util.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/util.clj b/storm-core/src/clj/org/apache/storm/util.clj
index 4765de8..4297a21 100644
--- a/storm-core/src/clj/org/apache/storm/util.clj
+++ b/storm-core/src/clj/org/apache/storm/util.clj
@@ -494,7 +494,8 @@
(kill-fn t)))))]
(.setDaemon thread daemon)
(.setPriority thread priority)
- (when thread-name
+ (when-not (clojure.string/blank? thread-name)
+ ;; if thead-name is blank, just use the default thread name
(.setName thread (str (.getName thread) "-" thread-name)))
(when start
(.start thread))
[3/3] storm git commit: Add STORM-2063 to CHANGELOG
Posted by ka...@apache.org.
Add STORM-2063 to CHANGELOG
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/106dfff6
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/106dfff6
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/106dfff6
Branch: refs/heads/1.0.x-branch
Commit: 106dfff61bbe4b4c47b52853b8f66ce7d7c54924
Parents: f22e32e
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 31 16:26:09 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 31 16:26:09 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/106dfff6/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e6d0d1..2263615 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 1.0.3
+ * STORM-2063: Add thread name in worker logs
* STORM-2042: Nimbus client connections not closed properly causing connection leaks
* STORM-2032: removes warning in case more than one metrics tuple is received
* STORM-1594: org.apache.storm.tuple.Fields can throw NPE if given invalid field in selector
[2/3] storm git commit: Merge branch 'STORM-2063-1.0.x' into
1.0.x-branch
Posted by ka...@apache.org.
Merge branch 'STORM-2063-1.0.x' into 1.0.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f22e32e7
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f22e32e7
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f22e32e7
Branch: refs/heads/1.0.x-branch
Commit: f22e32e7866944f5f605222e80edfe6478fe1cb9
Parents: 9ce36ad 54dd2a8
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 31 16:25:44 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 31 16:25:44 2016 +0900
----------------------------------------------------------------------
log4j2/worker.xml | 2 +-
storm-core/src/clj/org/apache/storm/util.clj | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------