Permalink
Browse files

[service-ng] Merge varz from base gem

git shortlog dcba6b3..a8e395b07e

Tang Rui (2):
      Fix service label bug
      Merge "Fix service label bug"

andyzh (2):
      [service-ng]make start timeout configurable
      Merge "[service-ng]make start timeout configurable"

felixhoo (2):
      [service-ng] Unmonitor the unhealthy instance.
      [service-ng] Define in-memory failed_times explicitly

Change-Id: Id525c866bd6851d28292e39aaa7ac28d68e60687
  • Loading branch information...
1 parent 7b2711b commit fe7b499392dc6b9d4fdfae60acb9b526af0b309e felixhoo committed Dec 18, 2012
Showing with 102 additions and 99 deletions.
  1. +1 −1 atmos/Gemfile
  2. +3 −3 atmos/Gemfile.lock
  3. BIN atmos/vendor/cache/cf-uaa-lib-1.3.1.gem
  4. BIN atmos/vendor/cache/cf-uaa-lib-1.3.3.gem
  5. +1 −1 couchdb/Gemfile
  6. +3 −3 couchdb/Gemfile.lock
  7. BIN couchdb/vendor/cache/cf-uaa-lib-1.3.1.gem
  8. BIN couchdb/vendor/cache/cf-uaa-lib-1.3.3.gem
  9. +1 −1 echo/Gemfile
  10. +3 −3 echo/Gemfile.lock
  11. BIN echo/vendor/cache/cf-uaa-lib-1.3.1.gem
  12. BIN echo/vendor/cache/cf-uaa-lib-1.3.3.gem
  13. +1 −1 elasticsearch/Gemfile
  14. +3 −3 elasticsearch/Gemfile.lock
  15. BIN elasticsearch/vendor/cache/cf-uaa-lib-1.3.1.gem
  16. BIN elasticsearch/vendor/cache/cf-uaa-lib-1.3.3.gem
  17. +1 −1 filesystem/Gemfile
  18. +3 −3 filesystem/Gemfile.lock
  19. BIN filesystem/vendor/cache/cf-uaa-lib-1.3.1.gem
  20. BIN filesystem/vendor/cache/cf-uaa-lib-1.3.3.gem
  21. +1 −1 marketplace/Gemfile
  22. +3 −3 marketplace/Gemfile.lock
  23. BIN marketplace/vendor/cache/cf-uaa-lib-1.3.1.gem
  24. BIN marketplace/vendor/cache/cf-uaa-lib-1.3.3.gem
  25. +1 −1 memcached/Gemfile
  26. +3 −3 memcached/Gemfile.lock
  27. BIN memcached/vendor/cache/cf-uaa-lib-1.3.1.gem
  28. BIN memcached/vendor/cache/cf-uaa-lib-1.3.3.gem
  29. +1 −1 neo4j/Gemfile
  30. +3 −3 neo4j/Gemfile.lock
  31. BIN neo4j/vendor/cache/cf-uaa-lib-1.3.1.gem
  32. BIN neo4j/vendor/cache/cf-uaa-lib-1.3.3.gem
  33. +1 −1 ng/memcached/Gemfile
  34. +3 −3 ng/memcached/Gemfile.lock
  35. +1 −1 ng/memcached/lib/memcached_service/memcached_node.rb
  36. BIN ng/memcached/vendor/cache/cf-uaa-lib-1.3.1.gem
  37. BIN ng/memcached/vendor/cache/cf-uaa-lib-1.3.3.gem
  38. +1 −1 ng/mongodb/Gemfile
  39. +3 −3 ng/mongodb/Gemfile.lock
  40. +3 −2 ng/mongodb/lib/mongodb_service/mongodb_node.rb
  41. BIN ng/mongodb/vendor/cache/cf-uaa-lib-1.3.1.gem
  42. BIN ng/mongodb/vendor/cache/cf-uaa-lib-1.3.3.gem
  43. +1 −1 ng/mysql/Gemfile
  44. +3 −3 ng/mysql/Gemfile.lock
  45. +10 −11 ng/mysql/lib/mysql_service/node.rb
  46. BIN ng/mysql/vendor/cache/cf-uaa-lib-1.3.1.gem
  47. BIN ng/mysql/vendor/cache/cf-uaa-lib-1.3.3.gem
  48. +1 −1 ng/postgresql/Gemfile
  49. +3 −3 ng/postgresql/Gemfile.lock
  50. +3 −3 ng/postgresql/lib/postgresql_service/node.rb
  51. +1 −1 ng/postgresql/lib/postgresql_service/with_warden.rb
  52. +2 −2 ng/postgresql/lib/postgresql_service/without_warden.rb
  53. BIN ng/postgresql/vendor/cache/cf-uaa-lib-1.3.1.gem
  54. BIN ng/postgresql/vendor/cache/cf-uaa-lib-1.3.3.gem
  55. +1 −1 ng/rabbit/Gemfile
  56. +3 −3 ng/rabbit/Gemfile.lock
  57. +1 −1 ng/rabbit/lib/rabbit_service/rabbit_node.rb
  58. BIN ng/rabbit/vendor/cache/cf-uaa-lib-1.3.1.gem
  59. BIN ng/rabbit/vendor/cache/cf-uaa-lib-1.3.3.gem
  60. +1 −1 ng/redis/Gemfile
  61. +3 −3 ng/redis/Gemfile.lock
  62. +1 −1 ng/redis/lib/redis_service/redis_node.rb
  63. BIN ng/redis/vendor/cache/cf-uaa-lib-1.3.1.gem
  64. BIN ng/redis/vendor/cache/cf-uaa-lib-1.3.3.gem
  65. +1 −1 ng/vblob/Gemfile
  66. +3 −3 ng/vblob/Gemfile.lock
  67. BIN ng/vblob/vendor/cache/cf-uaa-lib-1.3.1.gem
  68. BIN ng/vblob/vendor/cache/cf-uaa-lib-1.3.3.gem
  69. +3 −3 oauth2/Gemfile
  70. +13 −10 oauth2/Gemfile.lock
  71. +1 −1 tools/backup/manager/Gemfile
  72. +3 −3 tools/backup/manager/Gemfile.lock
  73. BIN tools/backup/manager/vendor/cache/cf-uaa-lib-1.3.1.gem
  74. BIN tools/backup/manager/vendor/cache/cf-uaa-lib-1.3.3.gem
View
@@ -13,7 +13,7 @@ gem "xml-simple"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
Binary file not shown.
Binary file not shown.
View
@@ -14,7 +14,7 @@ gem "couchrest"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
Binary file not shown.
Binary file not shown.
View
@@ -13,7 +13,7 @@ gem "thin"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
Binary file not shown.
Binary file not shown.
View
@@ -12,7 +12,7 @@ gem "rest-client"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
Binary file not shown.
Binary file not shown.
View
@@ -12,7 +12,7 @@ gem "thin"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
Binary file not shown.
Binary file not shown.
View
@@ -11,7 +11,7 @@ gem "cf-uaa-client"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -81,7 +81,7 @@ GEM
launchy
rest-client
yajl-ruby
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.1)
builder (>= 2.1.2)
Binary file not shown.
Binary file not shown.
View
@@ -12,7 +12,7 @@ gem "dalli"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
Binary file not shown.
Binary file not shown.
View
@@ -14,7 +14,7 @@ gem "thin"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
Binary file not shown.
Binary file not shown.
View
@@ -12,7 +12,7 @@ gem "dalli"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
@@ -221,7 +221,7 @@ def get_credentials(p_service)
end
def varz_details
- varz = {}
+ varz = super
varz[:provisioned_instances_num] = 0
varz[:max_instances_num] = @options[:capacity] / capacity_unit
Binary file not shown.
Binary file not shown.
View
@@ -16,7 +16,7 @@ gem "posix-spawn"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -77,7 +77,7 @@ GEM
bson_ext (1.5.2)
bson (= 1.5.2)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.9)
builder (>= 2.1.2)
@@ -290,6 +290,7 @@ def update_instance(service_credential, binding_credentials)
end
def varz_details
+ varz = super
# Do disk summary
du_hash = {}
du_all_out = `cd #{@base_dir}; du -sk * 2> /dev/null`
@@ -320,13 +321,13 @@ def varz_details
@logger.error("Error get instance list: #{e}")
end
- {
+ varz.merge!({
:running_services => stats,
:disk => du_hash,
:max_capacity => @max_capacity,
:available_capacity => @capacity,
:instances => provisioned_instances
- }
+ })
end
end
Binary file not shown.
Binary file not shown.
View
@@ -17,7 +17,7 @@ gem "curb"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '1b08b0c4eb'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
- ref: dcba6b3
+ revision: 1b08b0c4eb2f2b89d1091c5cf8d9c52624926557
+ ref: 1b08b0c4eb
specs:
vcap_services_base (0.1.17)
cf-uaa-lib
@@ -74,7 +74,7 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
- cf-uaa-lib (1.3.1)
+ cf-uaa-lib (1.3.3)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
@@ -43,17 +43,12 @@ def initialize(options)
@use_warden = false unless @use_warden === true
if @use_warden
require "mysql_service/with_warden"
- class << self
- include VCAP::Services::Mysql::WithWarden
- include VCAP::Services::Base::Utils
- include VCAP::Services::Base::Warden::NodeUtils
- def service_instances
- mysqlProvisionedService.all
- end
- end
+ self.class.send(:include, VCAP::Services::Mysql::WithWarden)
+ self.class.send(:include, VCAP::Services::Base::Utils)
+ self.class.send(:include, VCAP::Services::Base::Warden::NodeUtils)
else
require "mysql_service/without_warden"
- class << self; include VCAP::Services::Mysql::WithoutWarden; end
+ self.class.send(:include, VCAP::Services::Mysql::WithoutWarden)
end
init_internal(options)
@@ -91,6 +86,10 @@ class << self; include VCAP::Services::Mysql::WithoutWarden; end
mysqlProvisionedService.init(options)
end
+ def service_instances
+ mysqlProvisionedService.all
+ end
+
def pre_send_announcement
FileUtils.mkdir_p(@base_dir) if @base_dir
@@ -622,8 +621,8 @@ def exe_cmd(cmd, stdin=nil)
return [o, e, s]
end
- def varz_details()
- varz = {}
+ def varz_details
+ varz = super
# how many queries served since startup
varz[:queries_since_startup] = get_queries_status
# queries per second
Binary file not shown.
Binary file not shown.
Oops, something went wrong.

0 comments on commit fe7b499

Please sign in to comment.