Permalink
Browse files

Merge branch 'services-r8'

Change-Id: Ib03386fab155d37b54eea094d0a6493cde66a8a9
  • Loading branch information...
2 parents 1a445e2 + e61f916 commit cd74fa64c11e9f275ad49fafa19939bd0b8c78e8 figo committed Mar 7, 2012
Showing with 118 additions and 114 deletions.
  1. +1 −1 atmos/Gemfile
  2. +9 −9 atmos/Gemfile.lock
  3. BIN atmos/vendor/cache/json_pure-1.6.4.gem
  4. BIN atmos/vendor/cache/json_pure-1.6.5.gem
  5. BIN atmos/vendor/cache/nats-0.4.22.beta.4.gem
  6. BIN atmos/vendor/cache/nats-0.4.22.beta.8.gem
  7. BIN atmos/vendor/cache/vcap_common-1.0.4.gem
  8. BIN atmos/vendor/cache/vcap_common-1.0.8.gem
  9. BIN atmos/vendor/cache/vcap_services_base-0.1.6.gem
  10. BIN atmos/vendor/cache/vcap_services_base-0.1.7.gem
  11. +10 −10 base/Gemfile.lock
  12. +2 −2 base/lib/base/base.rb
  13. +2 −2 base/lib/base/provisioner.rb
  14. +1 −1 base/lib/base/version.rb
  15. +3 −2 base/vcap_services_base.gemspec
  16. +1 −1 filesystem/Gemfile
  17. +9 −9 filesystem/Gemfile.lock
  18. BIN filesystem/vendor/cache/json_pure-1.6.4.gem
  19. BIN filesystem/vendor/cache/json_pure-1.6.5.gem
  20. BIN filesystem/vendor/cache/nats-0.4.22.beta.4.gem
  21. BIN filesystem/vendor/cache/nats-0.4.22.beta.8.gem
  22. BIN filesystem/vendor/cache/vcap_common-1.0.4.gem
  23. BIN filesystem/vendor/cache/vcap_common-1.0.8.gem
  24. BIN filesystem/vendor/cache/vcap_services_base-0.1.6.gem
  25. BIN filesystem/vendor/cache/vcap_services_base-0.1.7.gem
  26. +1 −1 mongodb/Gemfile
  27. +9 −9 mongodb/Gemfile.lock
  28. BIN mongodb/vendor/cache/json_pure-1.6.4.gem
  29. BIN mongodb/vendor/cache/json_pure-1.6.5.gem
  30. BIN mongodb/vendor/cache/nats-0.4.22.beta.4.gem
  31. BIN mongodb/vendor/cache/nats-0.4.22.beta.8.gem
  32. BIN mongodb/vendor/cache/vcap_common-1.0.4.gem
  33. BIN mongodb/vendor/cache/vcap_common-1.0.8.gem
  34. BIN mongodb/vendor/cache/vcap_services_base-0.1.6.gem
  35. BIN mongodb/vendor/cache/vcap_services_base-0.1.7.gem
  36. +2 −2 mysql/Gemfile
  37. +12 −11 mysql/Gemfile.lock
  38. BIN mysql/vendor/cache/json_pure-1.6.4.gem
  39. BIN mysql/vendor/cache/json_pure-1.6.5.gem
  40. BIN mysql/vendor/cache/nats-0.4.22.beta.4.gem
  41. BIN mysql/vendor/cache/nats-0.4.22.beta.8.gem
  42. BIN mysql/vendor/cache/vcap_common-1.0.4.gem
  43. BIN mysql/vendor/cache/vcap_common-1.0.8.gem
  44. BIN mysql/vendor/cache/vcap_logging-0.1.3.gem
  45. BIN mysql/vendor/cache/vcap_logging-1.0.0.gem
  46. BIN mysql/vendor/cache/vcap_services_base-0.1.6.gem
  47. BIN mysql/vendor/cache/vcap_services_base-0.1.7.gem
  48. +1 −1 neo4j/Gemfile
  49. +9 −9 neo4j/Gemfile.lock
  50. BIN neo4j/vendor/cache/json_pure-1.6.4.gem
  51. BIN neo4j/vendor/cache/json_pure-1.6.5.gem
  52. BIN neo4j/vendor/cache/nats-0.4.22.beta.4.gem
  53. BIN neo4j/vendor/cache/nats-0.4.22.beta.8.gem
  54. BIN neo4j/vendor/cache/vcap_common-1.0.4.gem
  55. BIN neo4j/vendor/cache/vcap_common-1.0.8.gem
  56. BIN neo4j/vendor/cache/vcap_services_base-0.1.6.gem
  57. BIN neo4j/vendor/cache/vcap_services_base-0.1.7.gem
  58. +1 −1 postgresql/Gemfile
  59. +9 −9 postgresql/Gemfile.lock
  60. BIN postgresql/vendor/cache/json_pure-1.6.4.gem
  61. BIN postgresql/vendor/cache/json_pure-1.6.5.gem
  62. BIN postgresql/vendor/cache/nats-0.4.22.beta.4.gem
  63. BIN postgresql/vendor/cache/nats-0.4.22.beta.8.gem
  64. BIN postgresql/vendor/cache/vcap_common-1.0.4.gem
  65. BIN postgresql/vendor/cache/vcap_common-1.0.8.gem
  66. BIN postgresql/vendor/cache/vcap_services_base-0.1.6.gem
  67. BIN postgresql/vendor/cache/vcap_services_base-0.1.7.gem
  68. +1 −1 redis/Gemfile
  69. +9 −9 redis/Gemfile.lock
  70. BIN redis/vendor/cache/json_pure-1.6.4.gem
  71. BIN redis/vendor/cache/json_pure-1.6.5.gem
  72. BIN redis/vendor/cache/nats-0.4.22.beta.4.gem
  73. BIN redis/vendor/cache/nats-0.4.22.beta.8.gem
  74. BIN redis/vendor/cache/vcap_common-1.0.4.gem
  75. BIN redis/vendor/cache/vcap_common-1.0.8.gem
  76. BIN redis/vendor/cache/vcap_services_base-0.1.6.gem
  77. BIN redis/vendor/cache/vcap_services_base-0.1.7.gem
  78. +2 −1 serialization_data_server/Gemfile
  79. +6 −6 serialization_data_server/Gemfile.lock
  80. BIN serialization_data_server/vendor/cache/json_pure-1.6.4.gem
  81. BIN serialization_data_server/vendor/cache/json_pure-1.6.5.gem
  82. BIN serialization_data_server/vendor/cache/nats-0.4.22.beta.4.gem
  83. BIN serialization_data_server/vendor/cache/nats-0.4.22.beta.8.gem
  84. BIN serialization_data_server/vendor/cache/vcap_common-1.0.4.gem
  85. BIN serialization_data_server/vendor/cache/vcap_common-1.0.8.gem
  86. +1 −1 service_broker/Gemfile
  87. +9 −9 service_broker/Gemfile.lock
  88. BIN service_broker/vendor/cache/json_pure-1.6.4.gem
  89. BIN service_broker/vendor/cache/json_pure-1.6.5.gem
  90. BIN service_broker/vendor/cache/nats-0.4.22.beta.4.gem
  91. BIN service_broker/vendor/cache/nats-0.4.22.beta.8.gem
  92. BIN service_broker/vendor/cache/vcap_common-1.0.4.gem
  93. BIN service_broker/vendor/cache/vcap_common-1.0.8.gem
  94. BIN service_broker/vendor/cache/vcap_services_base-0.1.6.gem
  95. BIN service_broker/vendor/cache/vcap_services_base-0.1.7.gem
  96. +2 −1 tools/backup/manager/Gemfile
  97. +6 −6 tools/backup/manager/Gemfile.lock
  98. BIN tools/backup/manager/vendor/cache/json_pure-1.6.4.gem
  99. BIN tools/backup/manager/vendor/cache/json_pure-1.6.5.gem
  100. BIN tools/backup/manager/vendor/cache/nats-0.4.22.beta.4.gem
  101. BIN tools/backup/manager/vendor/cache/nats-0.4.22.beta.8.gem
  102. BIN tools/backup/manager/vendor/cache/vcap_common-1.0.4.gem
  103. BIN tools/backup/manager/vendor/cache/vcap_common-1.0.8.gem
View
@@ -11,7 +11,7 @@ gem "sinatra"
gem "thin"
gem "xml-simple"
-gem 'vcap_common', '>= 1.0.4', :require => ['vcap/common', 'vcap/component']
+gem 'vcap_common', '>= 1.0.8', :require => ['vcap/common', 'vcap/component']
gem 'vcap_logging', '>=0.1.3', :require => ['vcap/logging']
gem 'vcap_services_base'
View
@@ -63,14 +63,14 @@ 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)
@@ -116,29 +116,29 @@ GEM
uuid (2.3.4)
macaddr (~> 1.0)
uuidtools (2.1.2)
- vcap_common (1.0.4)
+ 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)
vcap_logging (0.1.3)
- 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)
em-http-request (~> 0.3.0)
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)
vegas (0.1.8)
rack (>= 1.0.0)
@@ -162,7 +162,7 @@ DEPENDENCIES
sinatra
thin
uuidtools
- vcap_common (>= 1.0.4)
+ vcap_common (>= 1.0.8)
vcap_logging (>= 0.1.3)
vcap_services_base
xml-simple
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -1,21 +1,22 @@
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)
em-http-request (~> 0.3.0)
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
@@ -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
@@ -730,8 +730,8 @@ def varz_details()
plan_mgmt = []
@plan_mgmt.each do |plan, v|
- plan_nodes = @nodes.select { |_, node| node["plan"] == plan }
- score = plan_nodes.inject { |sum, node| sum + node_score(node) }
+ plan_nodes = @nodes.select { |_, node| node["plan"] == plan.to_s }.values
+ score = plan_nodes.inject(0) { |sum, node| sum + node_score(node) }
plan_mgmt << {
:plan => plan,
:score => score,
View
@@ -1,7 +1,7 @@
module VCAP
module Services
module Base
- VERSION = "0.1.6"
+ VERSION = "0.1.7"
end
end
end
@@ -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"
View
@@ -10,7 +10,7 @@ gem "do_sqlite3"
gem "sinatra"
gem "thin"
-gem 'vcap_common', '>= 1.0.4', :require => ['vcap/common', 'vcap/component']
+gem 'vcap_common', '>= 1.0.8', :require => ['vcap/common', 'vcap/component']
gem 'vcap_logging', '>=0.1.3', :require => ['vcap/logging']
gem 'vcap_services_base'
View
@@ -63,14 +63,14 @@ 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)
@@ -116,29 +116,29 @@ GEM
uuid (2.3.4)
macaddr (~> 1.0)
uuidtools (2.1.2)
- vcap_common (1.0.4)
+ 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)
vcap_logging (0.1.3)
- 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)
em-http-request (~> 0.3.0)
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)
vegas (0.1.8)
rack (>= 1.0.0)
@@ -161,6 +161,6 @@ DEPENDENCIES
sinatra
thin
uuidtools
- vcap_common (>= 1.0.4)
+ vcap_common (>= 1.0.8)
vcap_logging (>= 0.1.3)
vcap_services_base
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -13,7 +13,7 @@ gem "bson_ext"
gem "thin"
gem "sinatra"
-gem 'vcap_common', '~> 1.0.4', :require => ['vcap/common', 'vcap/component']
+gem 'vcap_common', '~> 1.0.8', :require => ['vcap/common', 'vcap/component']
gem 'vcap_logging', '>=0.1.3', :require => ['vcap/logging']
gem "vcap_services_base"
View
@@ -66,7 +66,7 @@ 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)
@@ -75,7 +75,7 @@ GEM
mongo (1.5.2)
bson (= 1.5.2)
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)
@@ -121,29 +121,29 @@ GEM
uuid (2.3.4)
macaddr (~> 1.0)
uuidtools (2.1.2)
- vcap_common (1.0.4)
+ 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)
vcap_logging (0.1.3)
- 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)
em-http-request (~> 0.3.0)
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)
vegas (0.1.8)
rack (>= 1.0.0)
@@ -169,6 +169,6 @@ DEPENDENCIES
sinatra
thin
uuidtools
- vcap_common (~> 1.0.4)
+ vcap_common (~> 1.0.8)
vcap_logging (>= 0.1.3)
vcap_services_base
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
@@ -16,8 +16,8 @@ gem "resque-status", "~> 0.2.4"
gem "rake"
gem "curb"
-gem 'vcap_common', '>= 1.0.4', :require => ['vcap/common', 'vcap/component']
-gem 'vcap_logging', '>=0.1.3', :require => ['vcap/logging']
+gem 'vcap_common', '>= 1.0.8', :require => ['vcap/common', 'vcap/component']
+gem 'vcap_logging', '>=1.0.0', :require => ['vcap/logging']
gem "vcap_services_base"
group :test do
Oops, something went wrong.

0 comments on commit cd74fa6

Please sign in to comment.