You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by da...@apache.org on 2014/07/10 15:07:40 UTC
[1/3] git commit: change bug of readMsg
Repository: incubator-storm
Updated Branches:
refs/heads/master 8da9572ac -> 1471cbd49
change bug of readMsg
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/7ce0bff2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/7ce0bff2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/7ce0bff2
Branch: refs/heads/master
Commit: 7ce0bff2ca63c830e148385b4cce231152843d58
Parents: 2a60e99
Author: JuDasheng <ju...@meituan.com>
Authored: Fri Jun 13 12:12:54 2014 +0800
Committer: JuDasheng <ju...@meituan.com>
Committed: Fri Jun 13 12:12:54 2014 +0800
----------------------------------------------------------------------
storm-core/src/multilang/py/storm.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/7ce0bff2/storm-core/src/multilang/py/storm.py
----------------------------------------------------------------------
diff --git a/storm-core/src/multilang/py/storm.py b/storm-core/src/multilang/py/storm.py
index bec3f0c..fcb06e2 100755
--- a/storm-core/src/multilang/py/storm.py
+++ b/storm-core/src/multilang/py/storm.py
@@ -33,10 +33,12 @@ json_decode = lambda x: json.loads(x)
def readMsg():
msg = ""
while True:
- line = sys.stdin.readline()[0:-1]
- if line == "end":
+ line = sys.stdin.readline()
+ if not line:
+ raise Exception('Read EOF from stdin')
+ if line[0:-1] == "end":
break
- msg = msg + line + "\n"
+ msg = msg + line
return json_decode(msg[0:-1])
MODE = None
[2/3] git commit: Merge branch 'Multilang_stormpy' of
https://github.com/dashengju/incubator-storm into STORM-351
Posted by da...@apache.org.
Merge branch 'Multilang_stormpy' of https://github.com/dashengju/incubator-storm into STORM-351
STORM-351: multilang python process fall into endless loop
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/8c697bb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/8c697bb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/8c697bb1
Branch: refs/heads/master
Commit: 8c697bb1e553977c993fe2a728739fe5485f7313
Parents: 8da9572 7ce0bff
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Jul 10 07:59:02 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Jul 10 07:59:02 2014 -0500
----------------------------------------------------------------------
storm-core/src/multilang/py/storm.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/8c697bb1/storm-core/src/multilang/py/storm.py
----------------------------------------------------------------------
[3/3] git commit: Added STORM-351 to CHANGELOG
Posted by da...@apache.org.
Added STORM-351 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/1471cbd4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/1471cbd4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/1471cbd4
Branch: refs/heads/master
Commit: 1471cbd4912cea0dd59fc74553392762ce8c44bc
Parents: 8c697bb
Author: Derek Dagit <de...@yahoo-inc.com>
Authored: Thu Jul 10 08:01:15 2014 -0500
Committer: Derek Dagit <de...@yahoo-inc.com>
Committed: Thu Jul 10 08:01:15 2014 -0500
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/1471cbd4/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e37996..7c6a7a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
* STORM-266: Adding shell process pid and name in the log message
* STORM-367: Storm UI REST api documentation.
* STORM-200: Proposal for Multilang's Metrics feature
+ * STORM-351: multilang python process fall into endless loop
## 0.9.2-incubating
* STORM-66: send taskid on initial handshake