Revert "Rename Orchestra to Notifications [#3321 state:resolved]"
This reverts commit 8cbf825425
.
This commit is contained in:
parent
02b76862e1
commit
8b340ab2f6
|
@ -394,7 +394,7 @@ module ActionMailer #:nodoc:
|
|||
def controller_path
|
||||
self.class.controller_path
|
||||
end
|
||||
|
||||
|
||||
def formats
|
||||
@template.formats
|
||||
end
|
||||
|
@ -481,7 +481,7 @@ module ActionMailer #:nodoc:
|
|||
# Initialize the mailer via the given +method_name+. The body will be
|
||||
# rendered and a new TMail::Mail object created.
|
||||
def create!(method_name, *parameters) #:nodoc:
|
||||
ActiveSupport::Notifications.instrument(:create_mail, :name => method_name) do
|
||||
ActiveSupport::Orchestra.instrument(:create_mail, :name => method_name) do
|
||||
initialize_defaults(method_name)
|
||||
__send__(method_name, *parameters)
|
||||
|
||||
|
@ -550,7 +550,7 @@ module ActionMailer #:nodoc:
|
|||
logger.debug "\n#{mail.encoded}"
|
||||
end
|
||||
|
||||
ActiveSupport::Notifications.instrument(:deliver_mail, :mail => @mail) do
|
||||
ActiveSupport::Orchestra.instrument(:deliver_mail, :mail => @mail) do
|
||||
begin
|
||||
__send__("perform_delivery_#{delivery_method}", mail) if perform_deliveries
|
||||
rescue Exception => e # Net::SMTP errors or sendmail pipe errors
|
||||
|
@ -583,9 +583,9 @@ module ActionMailer #:nodoc:
|
|||
if template.respond_to?(:mime_type)
|
||||
@current_template_content_type = template.mime_type && template.mime_type.to_sym.to_s
|
||||
end
|
||||
|
||||
|
||||
@template = initialize_template_class(body)
|
||||
layout = _pick_layout(layout, true) unless
|
||||
layout = _pick_layout(layout, true) unless
|
||||
ActionController::Base.exempt_from_layout.include?(template.handler)
|
||||
@template._render_template(template, layout, {})
|
||||
ensure
|
||||
|
@ -601,16 +601,16 @@ module ActionMailer #:nodoc:
|
|||
def render(opts)
|
||||
opts[:locals] ||= {}
|
||||
layout, file = opts.delete(:layout), opts[:file]
|
||||
|
||||
|
||||
begin
|
||||
@template = initialize_template_class(opts.delete(:body))
|
||||
|
||||
|
||||
if file
|
||||
prefix = mailer_name unless file =~ /\//
|
||||
template = view_paths.find(file, {:formats => formats}, prefix)
|
||||
end
|
||||
|
||||
layout = _pick_layout(layout,
|
||||
layout = _pick_layout(layout,
|
||||
!template || ActionController::Base.exempt_from_layout.include?(template.handler))
|
||||
|
||||
if template
|
||||
|
@ -649,7 +649,7 @@ module ActionMailer #:nodoc:
|
|||
|
||||
def sort_parts(parts, order = [])
|
||||
order = order.collect { |s| s.downcase }
|
||||
|
||||
|
||||
parts = parts.sort do |a, b|
|
||||
a_ct = a.content_type.downcase
|
||||
b_ct = b.content_type.downcase
|
||||
|
@ -690,7 +690,7 @@ module ActionMailer #:nodoc:
|
|||
headers.each { |k, v| m[k] = v }
|
||||
|
||||
real_content_type, ctype_attrs = parse_content_type
|
||||
|
||||
|
||||
if @parts.empty?
|
||||
m.set_content_type(real_content_type, nil, ctype_attrs)
|
||||
m.body = normalize_new_lines(body)
|
||||
|
|
|
@ -47,7 +47,7 @@ module AbstractController
|
|||
# Override process_action in the AbstractController::Base
|
||||
# to log details about the method.
|
||||
def process_action(action)
|
||||
event = ActiveSupport::Notifications.instrument(:process_action,
|
||||
event = ActiveSupport::Orchestra.instrument(:process_action,
|
||||
:controller => self, :action => action) do
|
||||
super
|
||||
end
|
||||
|
|
|
@ -53,7 +53,7 @@ module ActionController #:nodoc:
|
|||
return content unless cache_configured?
|
||||
|
||||
key = fragment_cache_key(key)
|
||||
event = ActiveSupport::Notifications.instrument(:write_fragment, :key => key) do
|
||||
event = ActiveSupport::Orchestra.instrument(:write_fragment, :key => key) do
|
||||
cache_store.write(key, content, options)
|
||||
end
|
||||
|
||||
|
@ -66,7 +66,7 @@ module ActionController #:nodoc:
|
|||
return unless cache_configured?
|
||||
|
||||
key = fragment_cache_key(key)
|
||||
event = ActiveSupport::Notifications.instrument(:read_fragment, :key => key) do
|
||||
event = ActiveSupport::Orchestra.instrument(:read_fragment, :key => key) do
|
||||
cache_store.read(key, options)
|
||||
end
|
||||
|
||||
|
@ -79,7 +79,7 @@ module ActionController #:nodoc:
|
|||
return unless cache_configured?
|
||||
|
||||
key = fragment_cache_key(key)
|
||||
event = ActiveSupport::Notifications.instrument(:fragment_exist?, :key => key) do
|
||||
event = ActiveSupport::Orchestra.instrument(:fragment_exist?, :key => key) do
|
||||
cache_store.exist?(key, options)
|
||||
end
|
||||
|
||||
|
@ -110,7 +110,7 @@ module ActionController #:nodoc:
|
|||
key = fragment_cache_key(key) unless key.is_a?(Regexp)
|
||||
message = nil
|
||||
|
||||
event = ActiveSupport::Notifications.instrument(:expire_fragment, :key => key) do
|
||||
event = ActiveSupport::Orchestra.instrument(:expire_fragment, :key => key) do
|
||||
if key.is_a?(Regexp)
|
||||
message = "Expired fragments matching: #{key.source}"
|
||||
cache_store.delete_matched(key, options)
|
||||
|
|
|
@ -64,7 +64,7 @@ module ActionController #:nodoc:
|
|||
return unless perform_caching
|
||||
path = page_cache_path(path)
|
||||
|
||||
event = ActiveSupport::Notifications.instrument(:expire_page, :path => path) do
|
||||
event = ActiveSupport::Orchestra.instrument(:expire_page, :path => path) do
|
||||
File.delete(path) if File.exist?(path)
|
||||
end
|
||||
|
||||
|
@ -78,7 +78,7 @@ module ActionController #:nodoc:
|
|||
return unless perform_caching
|
||||
path = page_cache_path(path)
|
||||
|
||||
event = ActiveSupport::Notifications.instrument(:cache_page, :path => path) do
|
||||
event = ActiveSupport::Orchestra.instrument(:cache_page, :path => path) do
|
||||
FileUtils.makedirs(File.dirname(path))
|
||||
File.open(path, "wb+") { |f| f.write(content) }
|
||||
end
|
||||
|
|
|
@ -27,7 +27,7 @@ module ActionView
|
|||
end
|
||||
|
||||
def render(view, locals, &block)
|
||||
ActiveSupport::Notifications.instrument(:render_template, :identifier => identifier) do
|
||||
ActiveSupport::Orchestra.instrument(:render_template, :identifier => identifier) do
|
||||
method_name = compile(locals, view)
|
||||
view.send(method_name, locals, &block)
|
||||
end.result
|
||||
|
|
|
@ -630,7 +630,7 @@ class FragmentCachingTest < ActionController::TestCase
|
|||
fragment_computed = false
|
||||
|
||||
listener = []
|
||||
ActiveSupport::Notifications.register listener
|
||||
ActiveSupport::Orchestra.register listener
|
||||
|
||||
buffer = 'generated till now -> '
|
||||
@controller.fragment_for(buffer, 'expensive') { fragment_computed = true }
|
||||
|
@ -641,7 +641,7 @@ class FragmentCachingTest < ActionController::TestCase
|
|||
assert fragment_computed
|
||||
assert_equal 'generated till now -> ', buffer
|
||||
ensure
|
||||
ActiveSupport::Notifications.unregister listener
|
||||
ActiveSupport::Orchestra.unregister listener
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
@ -201,7 +201,7 @@ module ActiveRecord
|
|||
|
||||
protected
|
||||
def log(sql, name)
|
||||
event = ActiveSupport::Notifications.instrument(:sql, :sql => sql, :name => name) do
|
||||
event = ActiveSupport::Orchestra.instrument(:sql, :sql => sql, :name => name) do
|
||||
yield if block_given?
|
||||
end
|
||||
@runtime += event.duration
|
||||
|
|
|
@ -17,7 +17,7 @@ module ActiveSupport
|
|||
autoload :MessageVerifier, 'active_support/message_verifier'
|
||||
autoload :Multibyte, 'active_support/multibyte'
|
||||
autoload :OptionMerger, 'active_support/option_merger'
|
||||
autoload :Notifications, 'active_support/notifications'
|
||||
autoload :Orchestra, 'active_support/orchestra'
|
||||
autoload :OrderedHash, 'active_support/ordered_hash'
|
||||
autoload :OrderedOptions, 'active_support/ordered_options'
|
||||
autoload :Rescuable, 'active_support/rescuable'
|
||||
|
|
|
@ -247,7 +247,7 @@ module ActiveSupport
|
|||
payload = { :key => key }
|
||||
payload.merge!(options) if options.is_a?(Hash)
|
||||
|
||||
event = ActiveSupport::Notifications.instrument(:"cache_#{operation}", payload, &block)
|
||||
event = ActiveSupport::Orchestra.instrument(:"cache_#{operation}", payload, &block)
|
||||
log("#{operation} (%.1fms)" % event.duration, key, options)
|
||||
event.result
|
||||
end
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
require 'thread'
|
||||
|
||||
module ActiveSupport
|
||||
# Notifications provides an instrumentation API for Ruby. To instrument an action
|
||||
# Orchestra provides an instrumentation API for Ruby. To instrument an action
|
||||
# in Ruby you just need to:
|
||||
#
|
||||
# ActiveSupport::Notifications.instrument(:render, :extra => :information) do
|
||||
# ActiveSupport::Orchestra.instrument(:render, :extra => :information) do
|
||||
# render :text => "Foo"
|
||||
# end
|
||||
#
|
||||
|
@ -12,23 +12,23 @@ module ActiveSupport
|
|||
# to push. You can even register an array:
|
||||
#
|
||||
# @listener = []
|
||||
# ActiveSupport::Notifications.register @listener
|
||||
# ActiveSupport::Orchestra.register @listener
|
||||
#
|
||||
# ActiveSupport::Notifications.instrument(:render, :extra => :information) do
|
||||
# ActiveSupport::Orchestra.instrument(:render, :extra => :information) do
|
||||
# render :text => "Foo"
|
||||
# end
|
||||
#
|
||||
# event #=> ActiveSupport::Notifications::Event
|
||||
# event #=> ActiveSupport::Orchestra::Event
|
||||
# event.name #=> :render
|
||||
# event.duration #=> 10 (in miliseconds)
|
||||
# event.result #=> "Foo"
|
||||
# event.payload #=> { :extra => :information }
|
||||
#
|
||||
# Notifications ships with a default listener implementation which puts events in
|
||||
# Orchestra ships with a default listener implementation which puts events in
|
||||
# a stream and consume them in a Thread. This implementation is thread safe
|
||||
# and is available at ActiveSupport::Notifications::Listener.
|
||||
# and is available at ActiveSupport::Orchestra::Listener.
|
||||
#
|
||||
module Notifications
|
||||
module Orchestra
|
||||
@stacked_events = Hash.new { |h,k| h[k] = [] }
|
||||
@listeners = []
|
||||
|
|
@ -1,59 +1,59 @@
|
|||
require 'abstract_unit'
|
||||
|
||||
class NotificationsEventTest < Test::Unit::TestCase
|
||||
class OrchestraEventTest < Test::Unit::TestCase
|
||||
def setup
|
||||
@parent = ActiveSupport::Notifications::Event.new(:parent)
|
||||
@parent = ActiveSupport::Orchestra::Event.new(:parent)
|
||||
end
|
||||
|
||||
def test_initialization_with_name_and_parent_and_payload
|
||||
event = ActiveSupport::Notifications::Event.new(:awesome, @parent, :payload => "notifications")
|
||||
event = ActiveSupport::Orchestra::Event.new(:awesome, @parent, :payload => "orchestra")
|
||||
assert_equal(:awesome, event.name)
|
||||
assert_equal(@parent, event.parent)
|
||||
assert_equal({ :payload => "notifications" }, event.payload)
|
||||
assert_equal({ :payload => "orchestra" }, event.payload)
|
||||
end
|
||||
|
||||
def test_thread_id_is_set_on_initialization
|
||||
event = ActiveSupport::Notifications::Event.new(:awesome)
|
||||
event = ActiveSupport::Orchestra::Event.new(:awesome)
|
||||
assert_equal Thread.current.object_id, event.thread_id
|
||||
end
|
||||
|
||||
def test_current_time_is_set_on_initialization
|
||||
previous_time = Time.now.utc
|
||||
event = ActiveSupport::Notifications::Event.new(:awesome)
|
||||
event = ActiveSupport::Orchestra::Event.new(:awesome)
|
||||
assert_kind_of Time, event.time
|
||||
assert event.time.to_f >= previous_time.to_f
|
||||
end
|
||||
|
||||
|
||||
def test_duration_is_set_when_event_finishes
|
||||
event = ActiveSupport::Notifications::Event.new(:awesome)
|
||||
event = ActiveSupport::Orchestra::Event.new(:awesome)
|
||||
sleep(0.1)
|
||||
event.finish!
|
||||
assert_in_delta 100, event.duration, 30
|
||||
end
|
||||
end
|
||||
|
||||
class NotificationsMainTest < Test::Unit::TestCase
|
||||
class OrchestraMainTest < Test::Unit::TestCase
|
||||
def setup
|
||||
@listener = []
|
||||
ActiveSupport::Notifications.register @listener
|
||||
ActiveSupport::Orchestra.register @listener
|
||||
end
|
||||
|
||||
def teardown
|
||||
ActiveSupport::Notifications.unregister @listener
|
||||
ActiveSupport::Orchestra.unregister @listener
|
||||
end
|
||||
|
||||
def test_notifications_allows_any_action_to_be_instrumented
|
||||
event = ActiveSupport::Notifications.instrument(:awesome, "notifications") do
|
||||
def test_orchestra_allows_any_action_to_be_instrumented
|
||||
event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
|
||||
sleep(0.1)
|
||||
end
|
||||
|
||||
assert_equal :awesome, event.name
|
||||
assert_equal "notifications", event.payload
|
||||
assert_equal "orchestra", event.payload
|
||||
assert_in_delta 100, event.duration, 30
|
||||
end
|
||||
|
||||
def test_block_result_is_stored
|
||||
event = ActiveSupport::Notifications.instrument(:awesome, "notifications") do
|
||||
event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
|
||||
1 + 1
|
||||
end
|
||||
|
||||
|
@ -61,18 +61,18 @@ class NotificationsMainTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_events_are_published_to_a_listener
|
||||
event = ActiveSupport::Notifications.instrument(:awesome, "notifications") do
|
||||
event = ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
|
||||
1 + 1
|
||||
end
|
||||
|
||||
assert_equal 1, @listener.size
|
||||
assert_equal :awesome, @listener.last.name
|
||||
assert_equal "notifications", @listener.last.payload
|
||||
assert_equal "orchestra", @listener.last.payload
|
||||
end
|
||||
|
||||
def test_nested_events_can_be_instrumented
|
||||
ActiveSupport::Notifications.instrument(:awesome, "notifications") do
|
||||
ActiveSupport::Notifications.instrument(:wot, "child") do
|
||||
ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
|
||||
ActiveSupport::Orchestra.instrument(:wot, "child") do
|
||||
sleep(0.1)
|
||||
end
|
||||
|
||||
|
@ -86,23 +86,23 @@ class NotificationsMainTest < Test::Unit::TestCase
|
|||
|
||||
assert_equal 2, @listener.size
|
||||
assert_equal :awesome, @listener.last.name
|
||||
assert_equal "notifications", @listener.last.payload
|
||||
assert_equal "orchestra", @listener.last.payload
|
||||
assert_in_delta 100, @listener.first.parent.duration, 30
|
||||
end
|
||||
|
||||
def test_event_is_pushed_even_if_block_fails
|
||||
ActiveSupport::Notifications.instrument(:awesome, "notifications") do
|
||||
ActiveSupport::Orchestra.instrument(:awesome, "orchestra") do
|
||||
raise "OMG"
|
||||
end rescue RuntimeError
|
||||
|
||||
assert_equal 1, @listener.size
|
||||
assert_equal :awesome, @listener.last.name
|
||||
assert_equal "notifications", @listener.last.payload
|
||||
assert_equal "orchestra", @listener.last.payload
|
||||
end
|
||||
end
|
||||
|
||||
class NotificationsListenerTest < Test::Unit::TestCase
|
||||
class MyListener < ActiveSupport::Notifications::Listener
|
||||
class OrchestraListenerTest < Test::Unit::TestCase
|
||||
class MyListener < ActiveSupport::Orchestra::Listener
|
||||
attr_reader :consumed
|
||||
|
||||
def consume(event)
|
||||
|
@ -113,11 +113,11 @@ class NotificationsListenerTest < Test::Unit::TestCase
|
|||
|
||||
def setup
|
||||
@listener = MyListener.new
|
||||
ActiveSupport::Notifications.register @listener
|
||||
ActiveSupport::Orchestra.register @listener
|
||||
end
|
||||
|
||||
def teardown
|
||||
ActiveSupport::Notifications.unregister @listener
|
||||
ActiveSupport::Orchestra.unregister @listener
|
||||
end
|
||||
|
||||
def test_thread_is_exposed_by_listener
|
||||
|
@ -125,7 +125,7 @@ class NotificationsListenerTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_event_is_consumed_when_an_action_is_instrumented
|
||||
ActiveSupport::Notifications.instrument(:sum) do
|
||||
ActiveSupport::Orchestra.instrument(:sum) do
|
||||
1 + 1
|
||||
end
|
||||
sleep 0.1
|
||||
|
@ -136,10 +136,10 @@ class NotificationsListenerTest < Test::Unit::TestCase
|
|||
|
||||
def test_with_sevaral_consumers_and_several_events
|
||||
@another = MyListener.new
|
||||
ActiveSupport::Notifications.register @another
|
||||
ActiveSupport::Orchestra.register @another
|
||||
|
||||
1.upto(100) do |i|
|
||||
ActiveSupport::Notifications.instrument(:value) do
|
||||
ActiveSupport::Orchestra.instrument(:value) do
|
||||
i
|
||||
end
|
||||
end
|
||||
|
@ -156,6 +156,6 @@ class NotificationsListenerTest < Test::Unit::TestCase
|
|||
assert_equal 1, @another.consumed.first.result
|
||||
assert_equal 100, @another.consumed.last.result
|
||||
ensure
|
||||
ActiveSupport::Notifications.unregister @another
|
||||
ActiveSupport::Orchestra.unregister @another
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue