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:31 UTC
[1/4] 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.x-branch 9ae6e9873 -> 195480d14
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/5702e59c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/5702e59c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/5702e59c
Branch: refs/heads/1.x-branch
Commit: 5702e59ced32ae62aed9f59a26bd67136f092361
Parents: f9d47af
Author: Alessandro Bellina <ab...@yahoo-inc.com>
Authored: Mon Aug 29 07:44:18 2016 -0500
Committer: Alessandro Bellina <ab...@yahoo-inc.com>
Committed: Mon Aug 29 11:54:18 2016 -0500
----------------------------------------------------------------------
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/5702e59c/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/5702e59c/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))
[4/4] 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/195480d1
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/195480d1
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/195480d1
Branch: refs/heads/1.x-branch
Commit: 195480d146084ec8f882790712849dc4619c551e
Parents: 41e40e2
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 31 16:24:59 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 31 16:24:59 2016 +0900
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/195480d1/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffa83dc..24d62cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -78,6 +78,7 @@
* STORM-1720: Support GEO in storm-redis
## 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
[3/4] storm git commit: Merge branch
'STORM-2063_log_name_improvements' of https://github.com/abellina/storm into
STORM-2063-1.x
Posted by ka...@apache.org.
Merge branch 'STORM-2063_log_name_improvements' of https://github.com/abellina/storm into STORM-2063-1.x
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/41e40e26
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/41e40e26
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/41e40e26
Branch: refs/heads/1.x-branch
Commit: 41e40e26a3746ed30e97fbf9e81521dac52caf36
Parents: 9ae6e98 367ee48
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Wed Aug 31 16:24:39 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Wed Aug 31 16:24:39 2016 +0900
----------------------------------------------------------------------
external/storm-submit-tools/pom.xml | 4 ++--
log4j2/worker.xml | 2 +-
storm-core/src/clj/org/apache/storm/util.clj | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[2/4] storm git commit: Fix 1.x build due to storm--submit-tools
pointing at non-existing 1.1.1-SNAPSHOT
Posted by ka...@apache.org.
Fix 1.x build due to storm--submit-tools pointing at non-existing 1.1.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/367ee482
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/367ee482
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/367ee482
Branch: refs/heads/1.x-branch
Commit: 367ee482a0e3b1609250bb120fd6b168657ce82f
Parents: 5702e59
Author: Alessandro Bellina <ab...@yahoo-inc.com>
Authored: Mon Aug 29 09:19:39 2016 -0500
Committer: Alessandro Bellina <ab...@yahoo-inc.com>
Committed: Mon Aug 29 11:55:41 2016 -0500
----------------------------------------------------------------------
external/storm-submit-tools/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/367ee482/external/storm-submit-tools/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-submit-tools/pom.xml b/external/storm-submit-tools/pom.xml
index d2237b0..6e21d23 100644
--- a/external/storm-submit-tools/pom.xml
+++ b/external/storm-submit-tools/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>storm</artifactId>
<groupId>org.apache.storm</groupId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -198,4 +198,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>