influxdb-rails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83d8562fc4771f811d477633b9f525887b9ee756
-  data.tar.gz: e0e20f99c93955e5f26f6ab6736853a892a12fa8
+  metadata.gz: 35f471a2ffda4c8e99f655a76495be2e905e95cb
+  data.tar.gz: c00248d373decf1fc154477d12af68094b4b3460
 SHA512:
-  metadata.gz: 0b49739970a312a124277407741d1668726785db87938fa627eba0c032d13ed2f0bf00bf28704b8d48156867a12d38dd3eadb26f724935588f144b64638c4ccf
-  data.tar.gz: 381a5e180289b194a45a1b3f74067eb0e38739075642f305b4085d0be50106ddf2ca5fe0cb4babbe1b2566beee3b86cb5c8db5d89d8e1ebc893acd61b12b9eec
+  metadata.gz: 1ce921aceae8a76e3061950467c3802d97de5d8ead200b6fc02c32401fdf929f4b2b616bed0e0ad3b6c3964fa9eec0143f501725dba75dad1e1c2b4d6529b5f1
+  data.tar.gz: ca89d9fb3af58b642a1d068db1e9411a82906a33c2956d661056d3c43968d71bc1d2a80b568908c30054c4bad58bf4bf63e030c436805c13b34084641b29c1a7

data/lib/influxdb-rails.rb

@@ -46,9 +46,8 @@ module InfluxDB
           exception_presenter = ExceptionPresenter.new(e, env)
           log :info, "Exception: #{exception_presenter.to_json[0..512]}..."
 
-          InfluxDB::Rails.client.write_point "rails.exceptions",
-            :context => exception_presenter.context,
-            :dimensions => exception_presenter.dimensions
+          client.write_point "rails.exceptions",
+            exception_presenter.context.merge(exception_presenter.dimensions)
 
         rescue => e
           log :info, "[InfluxDB::Rails] Something went terribly wrong. Exception failed to take off! #{e.class}: #{e.message}"

data/lib/influxdb/rails/instrumentation.rb

@@ -5,10 +5,10 @@ module InfluxDB
         start = Time.now
         yield
 
-        unless InfluxDB.configuration.ignore_current_environment?
+        unless InfluxDB::Rails.configuration.ignore_current_environment?
           elapsed = ((Time.now - start) * 1000).ceil
-          dimensions = { :method => "#{controller_name}##{action_name}", :server => Socket.gethostname }
-          InfluxDB.aggregate "instrumentation", :value => elapsed, :dimensions => dimensions
+          InfluxDB::Rails.client.write_point "instrumentation",
+            :value => elapsed, :method => "#{controller_name}##{action_name}", :server => Socket.gethostname
         end
       end
 

data/lib/influxdb/rails/middleware/hijack_rescue_action_everywhere.rb

@@ -21,8 +21,8 @@ module InfluxDB
         def handle_exception(e)
           request_data = influxdb_request_data || {}
 
-          unless InfluxDB.configuration.ignore_user_agent?(request_data[:user_agent])
-            InfluxDB.report_exception_unless_ignorable(e, request_data)
+          unless InfluxDB::Rails.configuration.ignore_user_agent?(request_data[:user_agent])
+            InfluxDB::Rails.report_exception_unless_ignorable(e, request_data)
           end
         end
       end

data/lib/influxdb/rails/rack.rb

@@ -13,7 +13,7 @@ module InfluxDB
         begin
           status, headers, body = @app.call(env)
         rescue => e
-          InfluxDB.transmit_unless_ignorable(e, env)
+          InfluxDB::Rails.transmit_unless_ignorable(e, env)
           raise(e)
         ensure
           _body = []

data/lib/influxdb/rails/version.rb

@@ -1,5 +1,5 @@
 module InfluxDB
   module Rails
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Todd Persen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: influxdb
@@ -157,6 +157,7 @@ files:
 - gemfiles/Gemfile.rails-3.2.x.lock
 - gemfiles/Gemfile.rails-4.0.x
 - gemfiles/Gemfile.rails-4.0.x.lock
+- influxdb-rails-0.1.4.gem
 - influxdb-rails.gemspec
 - lib/influxdb-rails.rb
 - lib/influxdb/rails/air_traffic_controller.rb
@@ -168,7 +169,6 @@ files:
 - lib/influxdb/rails/middleware/hijack_render_exception.rb
 - lib/influxdb/rails/middleware/hijack_rescue_action_everywhere.rb
 - lib/influxdb/rails/rack.rb
-- lib/influxdb/rails/rails.rb
 - lib/influxdb/rails/railtie.rb
 - lib/influxdb/rails/version.rb
 - lib/rails/generators/influxdb/influxdb_generator.rb

data/lib/influxdb/rails/rails.rb

@@ -1,39 +0,0 @@
-require 'action_controller'
-require 'influxdb'
-require 'influxdb/rails/middleware/hijack_rescue_action_everywhere'
-require 'influxdb/rails/air_traffic_controller'
-require 'influxdb/rails/benchmarking'
-require 'influxdb/rails/instrumentation'
-
-module InfluxDB
-  module Rails
-    def self.initialize
-      ActionController::Base.send(:include, InfluxDB::Rails::AirTrafficController)
-      ActionController::Base.send(:include, InfluxDB::Rails::Middleware::HijackRescueActionEverywhere)
-      ActionController::Base.send(:include, InfluxDB::Rails::Benchmarking)
-      ActionController::Base.send(:include, InfluxDB::Rails::Instrumentation)
-
-      ::Rails.configuration.middleware.insert_after 'ActionController::Failsafe', InfluxDB::Rack
-
-      InfluxDB.configure(true) do |config|
-        config.logger                ||= ::Rails.logger
-        config.debug                   = true
-        config.environment           ||= ::Rails.env
-        config.application_root      ||= ::Rails.root
-        config.application_name      ||= "Application"
-        config.framework               = "Rails"
-        config.framework_version       = ::Rails.version
-      end
-
-      if defined?(PhusionPassenger)
-        PhusionPassenger.on_event(:starting_worker_process) do |forked|
-          InfluxDB::Worker.spawn_threads() if forked
-        end
-      else
-        InfluxDB::Worker.spawn_threads()
-      end
-    end
-  end
-end
-
-InfluxDB::Rails.initialize