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/12/28 22:59:33 UTC
[1/2] storm git commit: Fix storm.py which breaks when
client.jartransformer.class is not set
Repository: storm
Updated Branches:
refs/heads/1.x-branch 03efdb62f -> bbc8b641b
Fix storm.py which breaks when client.jartransformer.class is not set
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fef1641c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fef1641c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fef1641c
Branch: refs/heads/1.x-branch
Commit: fef1641ce5b30481ed30a52b730a1898ba33de09
Parents: 2aed0f6
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Dec 27 19:04:48 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Dec 27 19:04:48 2016 +0900
----------------------------------------------------------------------
bin/storm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/fef1641c/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 48e28b9..bdeb88f 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -294,7 +294,7 @@ def jar(jarfile, klass, *args):
artifact_to_file_jars = resolve_dependencies(DEP_ARTIFACTS_OPTS, DEP_ARTIFACTS_REPOSITORIES_OPTS)
transform_class = confvalue("client.jartransformer.class", [CLUSTER_CONF_DIR])
- if (transform_class != None and transform_class != "null"):
+ if (transform_class != None and transform_class != "nil"):
tmpjar = os.path.join(tempfile.gettempdir(), uuid.uuid1().hex+".jar")
exec_storm_class("org.apache.storm.daemon.ClientJarTransformerRunner", args=[transform_class, jarfile, tmpjar], fork=True, daemon=False)
extra_jars = [tmpjar, USER_CONF_DIR, STORM_BIN_DIR]
[2/2] storm git commit: Merge branch
'fix-storm-py-client-jar-transformer-is-not-set-1.x' into 1.x-branch
Posted by ka...@apache.org.
Merge branch 'fix-storm-py-client-jar-transformer-is-not-set-1.x' into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bbc8b641
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bbc8b641
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bbc8b641
Branch: refs/heads/1.x-branch
Commit: bbc8b641b811596a634121020de985c82cb8603c
Parents: 03efdb6 fef1641
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Thu Dec 29 07:59:24 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Thu Dec 29 07:59:24 2016 +0900
----------------------------------------------------------------------
bin/storm.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------