torquebox-messaging 2.0.2-java → 2.0.3-java

data/lib/torquebox/messaging/backgroundable.rb

@@ -33,6 +33,11 @@ module TorqueBox
         base.send(:include, FutureStatus)
       end
 
+      # Signals if the newrelic gem is loaded.
+      def self.newrelic_available?
+        defined?(NewRelic::Agent)
+      end
+
       # Allows you to background any method that has not been marked
       # as a backgrounded method via {ClassMethods#always_background}.
       # @param [Hash] options that are passed through to
@@ -77,13 +82,13 @@ module TorqueBox
         end
 
         def __enable_backgroundable_newrelic_tracing(method)
-          if defined?(NewRelic::Agent)
-            include(NewRelic::Agent::Instrumentation::ControllerInstrumentation) unless
+          if Backgroundable.newrelic_available?
+           include(NewRelic::Agent::Instrumentation::ControllerInstrumentation) unless
               include?(NewRelic::Agent::Instrumentation::ControllerInstrumentation)
             begin
               add_transaction_tracer(method, :name => method.sub("__sync_", ""), :category => :task)
             rescue Exception => e
-              log.error "Error loading New Relic for backgrounded method #{method.sub("__sync_", "")}: #{e}"
+              TorqueBox::Logger.new( Backgroundable ).error "Error loading New Relic for backgrounded method #{method.sub("__sync_", "")}: #{e}"
             end
           end
         end

data/lib/torquebox/messaging/backgroundable_processor.rb

@@ -23,16 +23,28 @@ module TorqueBox
   module Messaging
     class BackgroundableProcessor < MessageProcessor
 
+      def self.log_newrelic_notice(klass)
+        @newrelic_notice_logged ||=
+          log.warn( "The New Relic agent is loaded, but an issue with the inheritance hierachy of " <<
+                    klass.name << " prevents us from reporting on its Backgroundable calls." ) || true
+      end
+
       def on_message(hash)
         FutureResponder.new( Queue.new( hash[:future_queue] ), hash[:future_id] ).respond do
-          hash[:receiver].class.__enable_backgroundable_newrelic_tracing(hash[:method])
+          klass = hash[:receiver].class
+          if klass.respond_to?( :__enable_backgroundable_newrelic_tracing )
+            klass.__enable_backgroundable_newrelic_tracing( hash[:method] )
+          elsif Backgroundable.newrelic_available? 
+            self.class.log_newrelic_notice( klass )
+          end
+          
           hash[:receiver].send(hash[:method], *hash[:args])
         end
       end
 
       private
-      def log
-        @logger ||= TorqueBox::Logger.new(self.class)
+      def self.log
+        @logger ||= TorqueBox::Logger.new( self )
       end
     end
   end

data/lib/torquebox-messaging.rb

@@ -1,6 +1,6 @@
 module TorqueboxMessaging
-  VERSION = '2.0.2'
-  MAVEN_VERSION = '2.0.2'
+  VERSION = '2.0.3'
+  MAVEN_VERSION = '2.0.3'
 end
 begin
   require 'java'

metadata

@@ -2,7 +2,7 @@
 name: torquebox-messaging
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.2
+  version: 2.0.3
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-01 00:00:00 Z
+date: 2012-05-04 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: torquebox-core
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.2
+            version: 2.0.3
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.0.2
+            version: 2.0.3
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
@@ -88,42 +88,42 @@ files:
   - lib/gem_hook.rb
   - lib/org.torquebox.messaging-client.rb
   - lib/torquebox/messaging.rb
-  - lib/torquebox/messaging/queue.rb
-  - lib/torquebox/messaging/xa_connection.rb
-  - lib/torquebox/messaging/const_missing.rb
-  - lib/torquebox/messaging/processor_wrapper.rb
-  - lib/torquebox/messaging/destination.rb
-  - lib/torquebox/messaging/future.rb
-  - lib/torquebox/messaging/clojure_message.rb
-  - lib/torquebox/messaging/text_message.rb
-  - lib/torquebox/messaging/xa_session.rb
   - lib/torquebox/messaging/connection_factory.rb
-  - lib/torquebox/messaging/session.rb
-  - lib/torquebox/messaging/future_responder.rb
-  - lib/torquebox/messaging/backgroundable_processor.rb
-  - lib/torquebox/messaging/topic.rb
   - lib/torquebox/messaging/future_status.rb
-  - lib/torquebox/messaging/marshal_base64_message.rb
-  - lib/torquebox/messaging/task.rb
-  - lib/torquebox/messaging/message.rb
+  - lib/torquebox/messaging/xa_session.rb
+  - lib/torquebox/messaging/topic.rb
+  - lib/torquebox/messaging/message_processor.rb
   - lib/torquebox/messaging/backgroundable.rb
-  - lib/torquebox/messaging/json_message.rb
-  - lib/torquebox/messaging/connection.rb
+  - lib/torquebox/messaging/destination.rb
+  - lib/torquebox/messaging/backgroundable_processor.rb
+  - lib/torquebox/messaging/marshal_message.rb
   - lib/torquebox/messaging/xa_connection_factory.rb
-  - lib/torquebox/messaging/message_processor.rb
+  - lib/torquebox/messaging/future_responder.rb
+  - lib/torquebox/messaging/connection.rb
+  - lib/torquebox/messaging/xa_connection.rb
   - lib/torquebox/messaging/core.rb
-  - lib/torquebox/messaging/marshal_message.rb
+  - lib/torquebox/messaging/marshal_base64_message.rb
+  - lib/torquebox/messaging/message.rb
+  - lib/torquebox/messaging/task.rb
   - lib/torquebox/messaging/datamapper_marshaling.rb
+  - lib/torquebox/messaging/queue.rb
+  - lib/torquebox/messaging/clojure_message.rb
+  - lib/torquebox/messaging/text_message.rb
+  - lib/torquebox/messaging/processor_wrapper.rb
+  - lib/torquebox/messaging/json_message.rb
+  - lib/torquebox/messaging/const_missing.rb
+  - lib/torquebox/messaging/session.rb
+  - lib/torquebox/messaging/future.rb
   - lib/torquebox/messaging/ext/javax_jms_queue_browser.rb
-  - spec/json_message_spec.rb
-  - spec/future_spec.rb
-  - spec/task_spec.rb
+  - spec/future_responder_spec.rb
   - spec/destination_spec.rb
   - spec/message_processor_spec.rb
-  - spec/message_spec.rb
   - spec/backgroundable_spec.rb
+  - spec/future_spec.rb
+  - spec/task_spec.rb
+  - spec/message_spec.rb
+  - spec/json_message_spec.rb
   - spec/datamapper_marshaling_spec.rb
-  - spec/future_responder_spec.rb
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -147,17 +147,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: TorqueBox Messaging Client
 test_files: 
-  - spec/json_message_spec.rb
-  - spec/future_spec.rb
-  - spec/task_spec.rb
+  - spec/future_responder_spec.rb
   - spec/destination_spec.rb
   - spec/message_processor_spec.rb
-  - spec/message_spec.rb
   - spec/backgroundable_spec.rb
+  - spec/future_spec.rb
+  - spec/task_spec.rb
+  - spec/message_spec.rb
+  - spec/json_message_spec.rb
   - spec/datamapper_marshaling_spec.rb
-  - spec/future_responder_spec.rb