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 22:00:52 UTC
[1/2] storm git commit: add support for "error" command in ShellSpout
Repository: storm
Updated Branches:
refs/heads/0.9.x-branch a480eab7b -> 97de0853f
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/4d550c0f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/4d550c0f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/4d550c0f
Branch: refs/heads/0.9.x-branch
Commit: 4d550c0f085b86a0c305bd136bb1ddb7cb833d21
Parents: a480eab
Author: Andrew Montalenti <an...@parsely.com>
Authored: Thu Apr 23 16:41:39 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu May 7 12:07:30 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/4d550c0f/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/2] 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/97de0853
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/97de0853
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/97de0853
Branch: refs/heads/0.9.x-branch
Commit: 97de0853f252a173eaf13eed9a54e47009318f66
Parents: 4d550c0
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Thu May 7 12:07:43 2015 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Thu May 7 12:07:43 2015 -0400
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/97de0853/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94e0f4c..f86558d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.9.5
+ * STORM-796: Add support for "error" command in ShellSpout
* STORM-745: fix storm.cmd to evaluate 'shift' correctly with 'storm jar'
## 0.9.4