You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2015/05/07 18:05:15 UTC
[1/3] storm git commit: add support for "error" command in ShellSpout
Repository: storm
Updated Branches:
refs/heads/master ce49e1618 -> 60f8a8003
add support for "error" command in ShellSpout
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/2c35cb4d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/2c35cb4d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/2c35cb4d
Branch: refs/heads/master
Commit: 2c35cb4dec67604185d3b443a3e04a66fd4a6a6d
Parents: 2a45a9a
Author: Andrew Montalenti <an...@parsely.com>
Authored: Thu Apr 23 16:41:39 2015 -0400
Committer: Andrew Montalenti <an...@parsely.com>
Committed: Thu Apr 23 16:41:39 2015 -0400
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/spout/ShellSpout.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/2c35cb4d/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
index c79d175..ece11ee 100644
--- a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
+++ b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
@@ -154,6 +154,8 @@ public class ShellSpout implements ISpout {
return;
} else if (command.equals("log")) {
handleLog(shellMsg);
+ } else if (command.equals("error")) {
+ handleError(shellMsg.getMsg());
} else if (command.equals("emit")) {
String stream = shellMsg.getStream();
Long task = shellMsg.getTask();
@@ -206,6 +208,10 @@ public class ShellSpout implements ISpout {
}
}
+ private void handleError(String msg) {
+ _collector.reportError(new Exception("Shell Process Exception: " + msg));
+ }
+
@Override
public void activate() {
LOG.info("Start checking heartbeat...");
[2/3] storm git commit: Merge branch 'master' of
github.com:amontalenti/storm
Posted by pt...@apache.org.
Merge branch 'master' of github.com:amontalenti/storm
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/4d26d1c2
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4d26d1c2
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4d26d1c2
Branch: refs/heads/master
Commit: 4d26d1c2c78f48d89cdd528952fc097b9ab74b22
Parents: ce49e16 2c35cb4
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu May 7 11:57:36 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu May 7 11:57:36 2015 -0400
----------------------------------------------------------------------
storm-core/src/jvm/backtype/storm/spout/ShellSpout.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
[3/3] storm git commit: update changelog for STORM-796
Posted by pt...@apache.org.
update changelog for STORM-796
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/60f8a800
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/60f8a800
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/60f8a800
Branch: refs/heads/master
Commit: 60f8a8003fefaad8fe2961be671298eb688486e9
Parents: 4d26d1c
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu May 7 12:05:03 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu May 7 12:05:03 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/60f8a800/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1b16c8..d281395 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-796: Add support for "error" command in ShellSpout
* STORM-745: fix storm.cmd to evaluate 'shift' correctly with 'storm jar'
* STORM-603: Log errors when required kafka params are missing
* STORM-607: storm-hbase HBaseMapState should support user to customize the hbase-key & hbase-qualifier