Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Use patched JRuby-msgpack from Noah's GitHub acct until pull request …

…goes through. Update packaging scripts too
  • Loading branch information...
commit 7391ffcf57e9acd8263cc1672cc548c0aac47713 1 parent 9c71e52
@noahgibbs noahgibbs authored
View
2  Gemfile
@@ -2,3 +2,5 @@ source :rubygems
source "http://gems.ooyala.com:8080"
gemspec
+
+gem "jruby-msgpack", :git => "git@github.com:noahgibbs/jruby-msgpack.git"
View
2  bin/start_core.sh
@@ -12,4 +12,4 @@ export JAVA_OPTS="$GC_OPTS $RESOURCE_OPTS"
pkill -9 -f core.jar
-java -jar core.jar $JAVA_OPTS --router tcp://0.0.0.0:8126 &
+exec java -jar core.jar $JAVA_OPTS --router tcp://0.0.0.0:8126
View
2  bin/start_retrieval.sh
@@ -14,4 +14,4 @@ export JAVA_OPTS="$GC_OPTS $RESOURCE_OPTS $JETTY_OPTS"
pkill -9 -f retrieval_v2.war
-java $JAVA_OPTS -jar retrieval_v2.war &
+exec java $JAVA_OPTS -jar retrieval_v2.war
View
4 build/scripts/package_server.sh
@@ -16,9 +16,9 @@ cp build/binaries/libzmq* build/server/
# Build jars, copy into build/server/
rm -f jars/*.?ar
mkdir -p build/server
-rake core_jar
+rake core_jar || exit -1
mv build/jars/core.jar build/server/
-rake retrieval_war
+rake retrieval_war || exit -1
mv build/jars/retrieval_v2.war build/server/
# Hastur Core scripts
View
12 hastur-server.gemspec
@@ -33,30 +33,30 @@ EOS
s.add_development_dependency "mocha"
s.add_development_dependency "erubis"
s.add_development_dependency "rerun"
- s.add_development_dependency "nodule", "~>0.0.32"
+ s.add_development_dependency "nodule", ">=0.0.32"
s.add_development_dependency "yard"
s.add_development_dependency "redcarpet"
s.add_development_dependency "simplecov"
- s.add_development_dependency "test-unit", "~>2.4.3"
+ s.add_development_dependency "test-unit"
s.add_development_dependency "rack-test"
- s.add_development_dependency "minitest", "~>3.2.0"
+ s.add_development_dependency "minitest"
s.add_development_dependency "warbler"
s.add_runtime_dependency "sinatra"
s.add_runtime_dependency "httparty"
- s.add_runtime_dependency "multi_json", "~>1.3.2"
+ s.add_runtime_dependency "multi_json"
s.add_runtime_dependency "ffi-rzmq"
s.add_runtime_dependency "trollop"
s.add_runtime_dependency "uuid"
s.add_runtime_dependency "termite"
s.add_runtime_dependency "bluepill"
s.add_runtime_dependency "rainbow"
- s.add_runtime_dependency "hastur", "~>1.2.8"
+ s.add_runtime_dependency "hastur"
s.add_runtime_dependency "pony"
s.add_runtime_dependency "pry"
s.add_runtime_dependency "ohai"
s.add_runtime_dependency "sys-uname"
- s.add_runtime_dependency "hastur-rack", "~>0.0.10"
+ s.add_runtime_dependency "hastur-rack"
s.add_runtime_dependency "jruby-msgpack"
s.add_runtime_dependency "jruby_astyanax-jars"
end
Please sign in to comment.
Something went wrong with that request. Please try again.