From 378464a2e47bb849f3351cb8c87366554b7ce74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Thu, 21 Jan 2010 13:05:30 +0100
Subject: Default to sync instrumentation.

---
 actionpack/lib/action_dispatch.rb                  |  1 -
 .../action_dispatch/middleware/notifications.rb    | 32 ----------------------
 actionpack/lib/action_dispatch/railtie.rb          |  3 --
 .../lib/action_dispatch/railties/subscriber.rb     | 17 ------------
 4 files changed, 53 deletions(-)
 delete mode 100644 actionpack/lib/action_dispatch/middleware/notifications.rb
 delete mode 100644 actionpack/lib/action_dispatch/railties/subscriber.rb

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 42ff9ca2e4..f0490a5619 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -46,7 +46,6 @@ module ActionDispatch
     autoload :Cookies
     autoload :Flash
     autoload :Head
-    autoload :Notifications
     autoload :ParamsParser
     autoload :Rescue
     autoload :ShowExceptions
diff --git a/actionpack/lib/action_dispatch/middleware/notifications.rb b/actionpack/lib/action_dispatch/middleware/notifications.rb
deleted file mode 100644
index 65409f57fd..0000000000
--- a/actionpack/lib/action_dispatch/middleware/notifications.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-module ActionDispatch
-  # Provide notifications in the middleware stack. Notice that for the before_dispatch
-  # and after_dispatch notifications, we just send the original env, so we don't pile
-  # up large env hashes in the queue. However, in exception cases, the whole env hash
-  # is actually useful, so we send it all.
-  class Notifications
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      request = Request.new(env)
-      payload = retrieve_payload_from_env(request.filtered_env)
-
-      ActiveSupport::Notifications.instrument("action_dispatch.before_dispatch", payload)
-
-      ActiveSupport::Notifications.instrument!("action_dispatch.after_dispatch", payload) do
-        @app.call(env)
-      end
-    rescue Exception => exception
-      ActiveSupport::Notifications.instrument('action_dispatch.exception',
-        :env => env, :exception => exception)
-      raise exception
-    end
-
-    protected
-      # Remove any rack related constants from the env, like rack.input.
-      def retrieve_payload_from_env(env)
-        Hash[:env => env.except(*env.keys.select { |k| k.to_s.index("rack.") == 0 })]
-      end
-  end
-end
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index 18978bfb39..e4bd143e78 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -5,9 +5,6 @@ module ActionDispatch
   class Railtie < Rails::Railtie
     plugin_name :action_dispatch
 
-    require "action_dispatch/railties/subscriber"
-    subscriber ActionDispatch::Railties::Subscriber.new
-
     # Prepare dispatcher callbacks and run 'prepare' callbacks
     initializer "action_dispatch.prepare_dispatcher" do |app|
       # TODO: This used to say unless defined?(Dispatcher). Find out why and fix.
diff --git a/actionpack/lib/action_dispatch/railties/subscriber.rb b/actionpack/lib/action_dispatch/railties/subscriber.rb
deleted file mode 100644
index cdb1162eac..0000000000
--- a/actionpack/lib/action_dispatch/railties/subscriber.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-module ActionDispatch
-  module Railties
-    class Subscriber < Rails::Subscriber
-      def before_dispatch(event)
-        request = Request.new(event.payload[:env])
-        path    = request.request_uri.inspect rescue "unknown"
-
-        info "\n\nStarted #{request.method.to_s.upcase} #{path} " <<
-             "for #{request.remote_ip} at #{event.time.to_s(:db)}"
-      end
-
-      def logger
-        ActionController::Base.logger
-      end
-    end
-  end
-end
\ No newline at end of file
-- 
cgit v1.2.3