get the logger ready

technoweenie · technoweenie · commit c45fb90a57ab · 2012-04-20T14:55:06.000-06:00
diff --git a/lib/service.rb b/lib/service.rb
@@ -58,8 +58,7 @@ def current_sha
     # data    - A Hash with the configuration data for the Service.
     # payload - A Hash with the unique payload data for this Service instance.
     #
-    # Returns true if the Service responded to the event, or false if the
-    # Service does not respond to this event.
+    # Returns the Service instance if it responds to this event, or nil.
     def receive(event, data, payload = nil)
       svc = new(event, data, payload)
 
@@ -72,9 +71,7 @@ def receive(event, data, payload = nil)
           end
         end
 
-        true
-      else
-        false
+        svc
       end
     rescue Service::ConfigurationError, Errno::EHOSTUNREACH, Errno::ECONNRESET, SocketError, Net::ProtocolError => err
       Service.stats.increment "hook.fail.config.#{hook_name}"
@@ -572,7 +569,7 @@ def sanitize_log_value(value)
     string.strip!
     if string =~ /^[a-z]+\:\/\//
       uri = Addressable::URI.parse(string)
-      uri.password = "*" * uri.password.size
+      uri.password = "*" * uri.password.size if uri.password
       uri.to_s
     else
       string
diff --git a/lib/service/app.rb b/lib/service/app.rb
@@ -6,45 +6,45 @@ class Service::App < Sinatra::Base
 
   # Hooks the given Service to a Sinatra route.
   #
-  # svc - Service class.
+  # svc_class - Service class.
   #
   # Returns nothing.
-  def self.service(svc)
-    post "/#{svc.hook_name}/:event" do
+  def self.service(svc_class)
+    post "/#{svc_class.hook_name}/:event" do
       boom = nil
       time = Time.now.to_f
       data = nil
       begin
         event, data, payload = parse_request
-        if svc.receive(event, data, payload)
-          status 200
-          ""
+        if svc = svc_class.receive(event, data, payload)
+          log_service_request svc, 200
+          "OK"
         else
-          status 404
-          status "#{svc.hook_name} Service does not respond to 'push' events"
+          log_service_request svc, 200
+          "#{svc_class.hook_name} Service does not respond to 'push' events"
         end
       rescue Faraday::Error::ConnectionFailed => boom
-        status 503
+        log_service_request svc, 503
         boom.message
       rescue Service::ConfigurationError => boom
-        status 400
+        log_service_request svc, 400
         boom.message
       rescue Timeout::Error, Service::TimeoutError => boom
-        status 504
+        log_service_request svc, 504
         "Service Timeout"
       rescue Service::MissingError => boom
-        status 404
+        log_service_request svc, 404
         boom.message
       rescue Object => boom
-        report_exception svc, data, boom,
+        report_exception svc_class, data, boom,
           :event => event, :payload => payload.inspect
-        status 500
+        log_service_request svc, 500
         "ERROR"
       ensure
         duration = Time.now.to_f - time
-        if svc != Service::Web && duration > 9
+        if svc_class != Service::Web && duration > 9
           boom ||= Service::TimeoutError.new("Long Service Hook")
-          report_exception svc, data, boom,
+          report_exception svc_class, data, boom,
             :event => event, :payload => payload.inspect,
             :duration => "#{duration}s"
         end
@@ -77,6 +77,10 @@ def parse_http_request
     [params[:event], data, payload]
   end
 
+  def log_service_request(svc, code)
+    status code
+  end
+
   # Reports the given exception to Haystack.
   #
   # exception - An Exception instance.
diff --git a/test/web_test.rb b/test/web_test.rb
@@ -122,7 +122,7 @@ def test_log_data
 
   def test_log_message
     data = {
-      'url'          => 'http://user:pass@abc.com/def',
+      'url'          => 'http://abc.com/def',
       'secret'       => 'monkey',
       'content_type' => 'json'
     }

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ def test_log_data`
`122`	`122`
`123`	`123`	`def test_log_message`
`124`	`124`	`data = {`
`125`		`- 'url' => 'http://user:pass@abc.com/def',`
	`125`	`+ 'url' => 'http://abc.com/def',`
`126`	`126`	`'secret' => 'monkey',`
`127`	`127`	`'content_type' => 'json'`
`128`	`128`	`}`