Rely on our file path containing stormjar.jar in order to determine if we're ina supervisor

This is admittedly a bit hackish but I have yet to find any data at runtime
that indicates whether we're executing inside of a local mode (non jar) or
clustered mode other than this

Fixes #16
This commit is contained in:
R. Tyler Croy 2015-09-11 15:18:25 -07:00
parent 90defcd60f
commit a505e9c5c8
No known key found for this signature in database
GPG Key ID: 1426C7DC3F51E16F
4 changed files with 8 additions and 13 deletions

View File

@ -19,7 +19,7 @@ apply plugin: 'java'
apply plugin: 'com.github.jruby-gradle.jar'
apply plugin: 'com.jfrog.bintray'
version = '0.9.1'
version = '0.9.2'
group = 'com.github.jruby-gradle'
description = "RedStorm integrates Ruby code via JRuby into the Storm distributed computation system"
defaultTasks 'check', 'assemble'

View File

@ -5,10 +5,10 @@ module RedStorm
CWD = Dir.pwd
launch_path = File.expand_path(File.dirname(__FILE__))
jar_context = !!(launch_path =~ /\.jar!\/red_storm$/)
jar_context = !!(launch_path =~ /stormjar\.jar!\/red_storm$/)
if jar_context
BASE_PATH = File.expand_path(launch_path + '/..')
BASE_PATH = 'uri:classloader:/'
REDSTORM_HOME = BASE_PATH
GEM_PATH = "#{REDSTORM_HOME}/gems/"
# Make sure that when we're loading our environment up that we properly set
@ -44,15 +44,6 @@ module RedStorm
SRC_EXAMPLES = "#{REDSTORM_HOME}/examples"
DST_EXAMPLES = "#{CWD}/examples"
SRC_IVY_DIR = "#{REDSTORM_HOME}/ivy"
DST_IVY_DIR = "#{CWD}/ivy"
DEFAULT_IVY_SETTINGS = "#{SRC_IVY_DIR}/settings.xml"
CUSTOM_IVY_SETTINGS = "#{DST_IVY_DIR}/settings.xml"
DEFAULT_IVY_STORM_DEPENDENCIES = "#{SRC_IVY_DIR}/storm_dependencies.xml"
CUSTOM_IVY_STORM_DEPENDENCIES = "#{DST_IVY_DIR}/storm_dependencies.xml"
DEFAULT_IVY_TOPOLOGY_DEPENDENCIES = "#{SRC_IVY_DIR}/topology_dependencies.xml"
CUSTOM_IVY_TOPOLOGY_DEPENDENCIES = "#{DST_IVY_DIR}/topology_dependencies.xml"
DEFAULT_STORM_CONF_FILE = File.expand_path("~/.storm/storm.yaml") rescue ''
def current_ruby_mode
@ -72,3 +63,6 @@ module RedStorm
module_function :current_ruby_mode, :jruby_mode_token, :java_runtime_version
end
# Requiring this at the tail-end to make sure whatever modifications we needed to make to our environment works properly
require 'jars/setup'

View File

@ -54,6 +54,7 @@ class TopologyLauncher
$:.unshift File.expand_path(launch_path + '/target/lib')
begin
require 'jars/setup'
require "#{class_path}"
rescue => ex
puts "Failed to load #{class_path}! (#{ex.inspect})"

View File

@ -1,3 +1,3 @@
module RedStorm
VERSION = '0.7.0.beta1'
VERSION = '0.9.2'
end