Bump vcap_common to 1.0.10, nats to 0.4.22. Init the logger for the v…

…cap_component in router_v2. Change-Id: Iba3ce3bacfab870bed75cc8ae4fcb1ba807e91d9
cloudfoundry-attic · Mar 27, 2012 · 735c259 · 735c259
1 parent 1c56817
commit 735c259
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/Gemfile b/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/Gemfile.lock b/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)
+    json_pure (1.6.6)
-    little-plugger (1.1.3)
+    nats (0.4.22)
-    logging (1.6.2)
-      little-plugger (>= 1.1.3)
-    nats (0.4.22.beta.4)
       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.8)
-      nats (~> 0.4.22.beta.4)
       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/lib/router.rb b/lib/router.rb
@@ -8,7 +8,6 @@
 require 'rubygems'
 require 'bundler/setup'
 
-require 'logging'
 require 'nats/client'
 require 'http/parser'
 
@@ -144,7 +143,8 @@
                            :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