Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

bump nats, vcap_common, vcap_services_base gem

Change-Id: Ia385781e8b79beb05f2fb0698b9b973018468a25
  • Loading branch information...
commit 93b1be2b84557d55cfd20f79d7c7f94c792e5f24 1 parent 5212c21
@felixhoo felixhoo authored
View
20 Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- vcap_services_base (0.1.6)
+ vcap_services_base (0.1.7)
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
@@ -9,13 +9,14 @@ PATH
eventmachine (~> 0.12.11.cloudfoundry.3)
eventmachine_httpserver (~> 0.2.1)
json (~> 1.4.6)
- nats (~> 0.4.22.beta.4)
+ logging (>= 1.5.0)
+ nats (~> 0.4.22.beta.8)
resque-status (~> 0.2.4)
ruby-hmac (~> 0.4.0)
sinatra (~> 1.2.3)
thin (~> 1.3.1)
uuidtools (~> 2.1.2)
- vcap_common (>= 1.0.4)
+ vcap_common (>= 1.0.8)
vcap_logging (>= 0.1.3)
GEM
@@ -27,7 +28,7 @@ GEM
ci_reporter (1.6.4)
builder (>= 2.1.2)
curb (0.7.16)
- daemons (1.1.5)
+ daemons (1.1.8)
data_objects (0.10.7)
addressable (~> 2.1)
datamapper (1.1.0)
@@ -77,20 +78,20 @@ GEM
eventmachine_httpserver (0.2.1)
fastercsv (1.5.4)
json (1.4.6)
- json_pure (1.6.4)
+ json_pure (1.6.5)
little-plugger (1.1.3)
logging (1.6.1)
little-plugger (>= 1.1.2)
macaddr (1.5.0)
systemu (>= 2.4.0)
multi_json (1.0.4)
- nats (0.4.22.beta.4)
+ nats (0.4.22.beta.8)
daemons (>= 1.1.4)
eventmachine (>= 0.12.10)
json_pure (>= 1.6.1)
thin (>= 1.3.1)
posix-spawn (0.3.6)
- rack (1.4.0)
+ rack (1.4.1)
rake (0.8.7)
rcov (0.9.9)
redis (2.2.2)
@@ -130,10 +131,9 @@ GEM
uuid (2.3.4)
macaddr (~> 1.0)
uuidtools (2.1.2)
- vcap_common (1.0.6)
+ vcap_common (1.0.8)
eventmachine (~> 0.12.11.cloudfoundry.3)
- logging (>= 1.5.0)
- nats (~> 0.4.22.beta.4)
+ nats (~> 0.4.22.beta.8)
posix-spawn (~> 0.3.6)
thin (~> 1.3.1)
yajl-ruby (~> 0.8.3)
View
4 lib/base/base.rb
@@ -35,7 +35,6 @@ def initialize(options)
@node_nats = nil
if options[:mbus]
- @nats_lock = Mutex.new
NATS.on_error do |e|
@logger.error("Exiting due to NATS error: #{e}")
@@ -73,7 +72,8 @@ def service_description()
end
def publish(reply, msg)
- @nats_lock.synchronize do
+ # nats publish are only allowed to be called in reactor thread.
+ EM.schedule do
@node_nats.publish(reply, msg)
end
end
View
2  lib/base/version.rb
@@ -1,7 +1,7 @@
module VCAP
module Services
module Base
- VERSION = "0.1.6"
+ VERSION = "0.1.7"
end
end
end
View
5 vcap_services_base.gemspec
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
s.author = "CloudFoundry Services Team"
s.email = "cf-services-eng-cn@vmware.com"
- s.add_dependency "nats", "~> 0.4.22.beta.4"
+ s.add_dependency "nats", "~> 0.4.22.beta.8"
s.add_dependency "datamapper", "~> 1.1.0"
s.add_dependency "do_sqlite3", "~> 0.10.3"
s.add_dependency "eventmachine", "~> 0.12.11.cloudfoundry.3"
@@ -23,7 +23,8 @@ Gem::Specification.new do |s|
s.add_dependency "em-http-request", "~> 0.3.0"
s.add_dependency "sinatra", "~> 1.2.3"
s.add_dependency "thin", "~> 1.3.1"
- s.add_dependency "vcap_common", ">= 1.0.4"
+ s.add_dependency "vcap_common", ">= 1.0.8"
+ s.add_dependency "logging", ">= 1.5.0"
s.add_dependency "vcap_logging", ">=0.1.3"
s.add_dependency "resque-status", "~> 0.2.4"
s.add_dependency "curb", "~> 0.7.16"
Please sign in to comment.
Something went wrong with that request. Please try again.