You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/08/19 19:41:49 UTC
[1/3] git commit: fix the problem of log level implementation to
compatible with old log protocol with no loglevel
Repository: incubator-storm
Updated Branches:
refs/heads/master aa33ecd31 -> d4ebb6de2
fix the problem of log level implementation to compatible with old log protocol with no loglevel
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/837b9e50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/837b9e50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/837b9e50
Branch: refs/heads/master
Commit: 837b9e50acbfb3b91009ed08259c44e0efebcebf
Parents: b1c5e7e
Author: JuDasheng <ju...@meituan.com>
Authored: Thu Aug 7 16:39:59 2014 +0800
Committer: JuDasheng <ju...@meituan.com>
Committed: Thu Aug 7 16:39:59 2014 +0800
----------------------------------------------------------------------
.../src/jvm/backtype/storm/multilang/JsonSerializer.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/837b9e50/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
index fc97073..084a952 100644
--- a/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
+++ b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
@@ -147,8 +147,11 @@ public class JsonSerializer implements ISerializer {
shellMsg.setMetricParams(paramsObj);
if (command.equals("log")) {
- long logLevel = (Long)msg.get("level");
- shellMsg.setLogLevel((int)logLevel);
+ Object logLevelObj = msg.get("level");
+ if (logLevelObj != null && logLevelObj instanceof Long) {
+ long logLevel = (Long)logLevelObj;
+ shellMsg.setLogLevel((int)logLevel);
+ }
}
return shellMsg;
[3/3] git commit: Added STORM-443 to Changelog
Posted by bo...@apache.org.
Added STORM-443 to Changelog
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/d4ebb6de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/d4ebb6de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/d4ebb6de
Branch: refs/heads/master
Commit: d4ebb6de222a1f017c15104b5b8d463f6c232cd7
Parents: 0d82c2f
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Tue Aug 19 12:33:49 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Tue Aug 19 12:33:49 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/d4ebb6de/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 680dc94..0d6e8c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
* STORM-453: migrated to curator 2.5.0
* STORM-458: sample spout uses incorrect name when connecting bolt
* STORM-455: Report error-level messages from ShellBolt children
+ * STORM-443: multilang log's loglevel protocol can cause hang
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake
[2/3] git commit: Merge branch 'Multilang_JsonSerializer' of
https://github.com/dashengju/incubator-storm into STORM-443
Posted by bo...@apache.org.
Merge branch 'Multilang_JsonSerializer' of https://github.com/dashengju/incubator-storm into STORM-443
STORM-443: multilang log's loglevel protocol can cause hang
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/0d82c2fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/0d82c2fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/0d82c2fc
Branch: refs/heads/master
Commit: 0d82c2fc127343f18c3b41ae7951989a6515f371
Parents: aa33ecd 837b9e5
Author: Robert (Bobby) Evans <bo...@apache.org>
Authored: Tue Aug 19 12:32:55 2014 -0500
Committer: Robert (Bobby) Evans <bo...@apache.org>
Committed: Tue Aug 19 12:32:55 2014 -0500
----------------------------------------------------------------------
.../src/jvm/backtype/storm/multilang/JsonSerializer.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------