From 343f9c9c8fade7612065ee83f89644f4bb8f48d3 Mon Sep 17 00:00:00 2001 From: Dan Blanchard Date: Tue, 16 Jun 2015 16:10:04 -0400 Subject: [PATCH] Make prepare_topology get called in jar_for_deploy instead of in submit_topology --- streamparse/cli/jar.py | 4 ++++ streamparse/cli/submit.py | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/streamparse/cli/jar.py b/streamparse/cli/jar.py index 11678bcc..19019e60 100644 --- a/streamparse/cli/jar.py +++ b/streamparse/cli/jar.py @@ -9,10 +9,14 @@ from invoke import run from .common import add_simple_jar +from ..util import prepare_topology def jar_for_deploy(simple_jar=False): """ Build a jar to use for deploying the topology. """ + # Create _resources folder which will contain Python code in JAR + prepare_topology() + # Use Leiningen to clean up and build JAR jar_type = "JAR" if simple_jar else "Uber-JAR" print("Cleaning from prior builds...") sys.stdout.flush() diff --git a/streamparse/cli/submit.py b/streamparse/cli/submit.py index 7bf798a2..456aeb37 100644 --- a/streamparse/cli/submit.py +++ b/streamparse/cli/submit.py @@ -164,8 +164,6 @@ def submit_topology(name=None, env_name="prod", workers=2, ackers=2, options=None, force=False, debug=False, wait=None, simple_jar=False): """Submit a topology to a remote Storm cluster.""" - prepare_topology() - config = get_config() name, topology_file = get_topology_definition(name) env_name, env_config = get_env_config(env_name)