diff --git a/AUTHORS b/AUTHORS index f633302..f177626 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,6 +11,7 @@ - Adam C. Greenfield { email: adam.greenfield@gmail.com } - Ananthan Srinivasan { email: asrinivasan@vmware.com, name: AB} - Andrew Liu { email: aliu@vmware.com} +- Anfernee Yongkun Gui { email: agui@vmware.com } - Christian Dupuis { email: cdupuis@vmware.com} - Derek Collison { email: dcollison@vmware.com } - Ezra Zygmuntowicz { email: ez@vmware.com } diff --git a/router/Gemfile b/router/Gemfile index 15aee33..5895f6f 100644 --- a/router/Gemfile +++ b/router/Gemfile @@ -9,7 +9,7 @@ gem "http_parser.rb", :require => "http/parser" gem "yajl-ruby", :require => ["yajl", "yajl/json_gem"] gem "sinatra" -gem 'vcap_common', '~> 1.0.3' +gem 'vcap_common', '~> 1.0.9' gem 'vcap_logging', :require => ['vcap/logging'] group :test do diff --git a/router/Gemfile.lock b/router/Gemfile.lock index 8299833..1f48c22 100644 --- a/router/Gemfile.lock +++ b/router/Gemfile.lock @@ -4,21 +4,18 @@ GEM builder (3.0.0) ci_reporter (1.6.4) builder (>= 2.1.2) - daemons (1.1.5) + daemons (1.1.8) diff-lcs (1.1.2) eventmachine (0.12.11.cloudfoundry.3) http_parser.rb (0.5.1) - json_pure (1.6.4) - little-plugger (1.1.3) - logging (1.6.2) - little-plugger (>= 1.1.3) - nats (0.4.22.beta.4) + json_pure (1.6.6) + nats (0.4.22) 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) rack-protection (1.2.0) rack rake (0.8.7) @@ -40,10 +37,9 @@ GEM eventmachine (>= 0.12.6) rack (>= 1.0.0) tilt (1.3.3) - vcap_common (1.0.3) + vcap_common (1.0.10) 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) @@ -63,6 +59,6 @@ DEPENDENCIES rcov rspec sinatra - vcap_common (~> 1.0.3) + vcap_common (~> 1.0.9) vcap_logging yajl-ruby diff --git a/router/lib/router.rb b/router/lib/router.rb index b54fee7..bed4ac6 100644 --- a/router/lib/router.rb +++ b/router/lib/router.rb @@ -8,7 +8,6 @@ require 'openssl' require 'rubygems' require 'bundler/setup' -require 'logging' require 'nats/client' require 'http/parser' @@ -144,7 +143,8 @@ EM.run do :config => config, :port => status_config['port'], :user => status_config['user'], - :password => status_config['password']) + :password => status_config['password'], + :logger => Router.log) # Setup some of our varzs.. VCAP::Component.varz[:requests] = 0 diff --git a/router/vendor/cache/daemons-1.1.5.gem b/router/vendor/cache/daemons-1.1.5.gem deleted file mode 100644 index 94ff684..0000000 Binary files a/router/vendor/cache/daemons-1.1.5.gem and /dev/null differ diff --git a/router/vendor/cache/daemons-1.1.8.gem b/router/vendor/cache/daemons-1.1.8.gem new file mode 100644 index 0000000..c7cf523 Binary files /dev/null and b/router/vendor/cache/daemons-1.1.8.gem differ diff --git a/router/vendor/cache/json_pure-1.6.4.gem b/router/vendor/cache/json_pure-1.6.4.gem deleted file mode 100644 index e2f448b..0000000 Binary files a/router/vendor/cache/json_pure-1.6.4.gem and /dev/null differ diff --git a/router/vendor/cache/json_pure-1.6.6.gem b/router/vendor/cache/json_pure-1.6.6.gem new file mode 100644 index 0000000..a127118 Binary files /dev/null and b/router/vendor/cache/json_pure-1.6.6.gem differ diff --git a/router/vendor/cache/little-plugger-1.1.3.gem b/router/vendor/cache/little-plugger-1.1.3.gem deleted file mode 100644 index 2b98117..0000000 Binary files a/router/vendor/cache/little-plugger-1.1.3.gem and /dev/null differ diff --git a/router/vendor/cache/logging-1.6.2.gem b/router/vendor/cache/logging-1.6.2.gem deleted file mode 100644 index a45eca7..0000000 Binary files a/router/vendor/cache/logging-1.6.2.gem and /dev/null differ diff --git a/router/vendor/cache/nats-0.4.22.beta.4.gem b/router/vendor/cache/nats-0.4.22.beta.4.gem deleted file mode 100644 index ea23a93..0000000 Binary files a/router/vendor/cache/nats-0.4.22.beta.4.gem and /dev/null differ diff --git a/router/vendor/cache/nats-0.4.22.gem b/router/vendor/cache/nats-0.4.22.gem new file mode 100644 index 0000000..92124d3 Binary files /dev/null and b/router/vendor/cache/nats-0.4.22.gem differ diff --git a/router/vendor/cache/rack-1.4.0.gem b/router/vendor/cache/rack-1.4.0.gem deleted file mode 100644 index 5d5d0ec..0000000 Binary files a/router/vendor/cache/rack-1.4.0.gem and /dev/null differ diff --git a/router/vendor/cache/rack-1.4.1.gem b/router/vendor/cache/rack-1.4.1.gem new file mode 100644 index 0000000..6ed5b80 Binary files /dev/null and b/router/vendor/cache/rack-1.4.1.gem differ diff --git a/router/vendor/cache/vcap_common-1.0.10.gem b/router/vendor/cache/vcap_common-1.0.10.gem new file mode 100644 index 0000000..2ef5c4c Binary files /dev/null and b/router/vendor/cache/vcap_common-1.0.10.gem differ diff --git a/router/vendor/cache/vcap_common-1.0.3.gem b/router/vendor/cache/vcap_common-1.0.3.gem deleted file mode 100644 index a69fc26..0000000 Binary files a/router/vendor/cache/vcap_common-1.0.3.gem and /dev/null differ