You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ki...@apache.org on 2015/06/12 16:44:29 UTC
[2/4] storm git commit: Addressing CR
Addressing CR
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/165ae10b
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/165ae10b
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/165ae10b
Branch: refs/heads/master
Commit: 165ae10be8a95d51473553e050e49935c6267586
Parents: ff187f6
Author: nsingh1 <ns...@yahoo-inc.com>
Authored: Mon Jun 8 15:32:41 2015 -0500
Committer: nsingh1 <ns...@yahoo-inc.com>
Committed: Mon Jun 8 15:32:41 2015 -0500
----------------------------------------------------------------------
bin/storm.py | 2 +-
storm-core/src/clj/backtype/storm/command/get_errors.clj | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/165ae10b/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 80981c7..6f3274c 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -315,7 +315,7 @@ def get_errors(*args):
"backtype.storm.command.get_errors",
args=args,
jvmtype="-client",
- extrajars=[USER_CONF_DIR, STORM_DIR + "/bin"])
+ extrajars=[USER_CONF_DIR, os.path.join(STORM_DIR, "bin")])
def shell(resourcesdir, command, *args):
tmpjarpath = "stormshell" + str(random.randint(0, 10000000)) + ".jar"
http://git-wip-us.apache.org/repos/asf/storm/blob/165ae10b/storm-core/src/clj/backtype/storm/command/get_errors.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/command/get_errors.clj b/storm-core/src/clj/backtype/storm/command/get_errors.clj
index 62fd592..60707b2 100644
--- a/storm-core/src/clj/backtype/storm/command/get_errors.clj
+++ b/storm-core/src/clj/backtype/storm/command/get_errors.clj
@@ -47,6 +47,6 @@
(println (to-json {"Failure" (str "No topologies running with name " name)}))
(let [topology-name (.get_name topo-info)
topology-errors (.get_errors topo-info)]
- (println (to-json (hash-map
- "Topology Name" topology-name
- "Comp-Errors" (get-component-errors topology-errors)))))))))
+ (println (to-json (hash-map
+ "Topology Name" topology-name
+ "Comp-Errors" (get-component-errors topology-errors)))))))))