librato-rails 0.7.1 → 0.7.2

data/lib/librato/rails/version.rb

@@ -1,5 +1,5 @@
 module Librato
   module Rails
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
   end
 end

data/lib/librato/rails.rb

@@ -54,13 +54,17 @@ module Librato
 
       # detect / update configuration
       def check_config
+        self.log_level = ENV['LIBRATO_METRICS_LOG_LEVEL'] if ENV['LIBRATO_METRICS_LOG_LEVEL']
         if self.config_file && File.exists?(self.config_file)
-          log :debug, "configuration file present, ignoring ENV variables"
-          env_specific = YAML.load(ERB.new(File.read(config_file)).result)[::Rails.env]
-          settable = CONFIG_SETTABLE & env_specific.keys
-          settable.each { |key| self.send("#{key}=", env_specific[key]) }
+          log :debug, "configuring with librato.yml; ignoring environment variables.."
+          if env_specific = YAML.load(ERB.new(File.read(config_file)).result)[::Rails.env]
+            settable = CONFIG_SETTABLE & env_specific.keys
+            settable.each { |key| self.send("#{key}=", env_specific[key]) }
+          else
+            log :debug, "current environment not in config file, halting"
+          end
         else
-          log :debug, "no configuration file present, using ENV variables"
+          log :debug, "using environment variables for configuration.."
           %w{user token source log_level}.each do |settable|
             env_var = "LIBRATO_METRICS_#{settable.upcase}"
             send("#{settable}=", ENV[env_var]) if ENV[env_var]
@@ -92,7 +96,7 @@ module Librato
       def flush
         log :debug, "flushing pid #{@pid} (#{Time.now}).."
         start = Time.now
-        queue = client.new_queue(:source => qualified_source, 
+        queue = client.new_queue(:source => qualified_source,
           :prefix => self.prefix, :skip_measurement_times => true)
         # thread safety is handled internally for both stores
         counters.flush_to(queue)
@@ -197,13 +201,6 @@ module Librato
         FORKING_SERVERS.include?(app_server)
       end
 
-      # there isn't anything in the environment before the
-      # first request to know if we're running on heroku, but
-      # they set all hostnames to UUIDs.
-      def implicit_source_on_heroku?
-        !explicit_source && on_heroku
-      end
-
       def logger
         @logger ||= if on_heroku
           logger = Logger.new(STDOUT)
@@ -239,8 +236,15 @@ module Librato
       end
 
       def should_start?
-        return false if implicit_source_on_heroku?
-        self.user && self.token # are credentials present?
+        if !self.user || !self.token
+          log :debug, 'credentials not present, halting..'
+          false
+        elsif !explicit_source && on_heroku
+          log :debug, 'source must be set, halting..'
+          false
+        else
+          true
+        end
       end
 
       def source_is_uuid?(source)

data/test/dummy/log/test.log

@@ -4299,3 +4299,251 @@ Completed 200 OK in 302ms (Views: 0.6ms | ActiveRecord: 0.0ms)
   SQL (0.1ms)  DELETE FROM "users" WHERE "users"."id" = ?  [["id", 1]]
    (0.0ms)  RELEASE SAVEPOINT active_record_1
    (0.6ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateUsers (20120719231810)
+   (0.1ms)  begin transaction
+
+
+Started GET "/custom" for 127.0.0.1 at 2012-11-06 09:33:21 -0600
+Processing by HomeController#custom as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 38ms (Views: 10.9ms | ActiveRecord: 0.3ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+
+
+Started GET "/custom" for 127.0.0.1 at 2012-11-06 09:33:21 -0600
+Processing by HomeController#custom as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 1ms (Views: 0.4ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+
+
+Started GET "/custom" for 127.0.0.1 at 2012-11-06 09:33:21 -0600
+Processing by HomeController#custom as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 0ms (Views: 0.2ms | ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (8.8ms)  INSERT INTO "users" ("created_at", "email", "password", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Tue, 06 Nov 2012 15:33:22 UTC +00:00], ["email", "foo@foo.com"], ["password", "wow"], ["updated_at", Tue, 06 Nov 2012 15:33:22 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Rendered user_mailer/welcome_email.text.erb (2.5ms)
+
+Sent mail to foo@foo.com (52ms)
+Date: Tue, 06 Nov 2012 09:33:23 -0600
+From: from@librato-rails.com
+To: foo@foo.com
+Message-ID: <50992dc36690_194b3fd788c34cdc773e@Arcas.local.mail>
+Subject: Why Howdy!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+This is a sample email, yay!
+   (0.4ms)  rollback transaction
+   (0.1ms)  begin transaction
+
+
+Started GET "/" for 127.0.0.1 at 2012-11-06 09:33:23 -0600
+Processing by HomeController#index as HTML
+  Rendered home/index.html.erb within layouts/application (0.5ms)
+Completed 200 OK in 5ms (Views: 4.8ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/status/204" for 127.0.0.1 at 2012-11-06 09:33:23 -0600
+Processing by StatusController#index as HTML
+  Parameters: {"code"=>"204"}
+  Rendered text template (0.0ms)
+Completed 204 No Content in 2ms (Views: 1.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+
+
+Started GET "/" for 127.0.0.1 at 2012-11-06 09:33:23 -0600
+Processing by HomeController#index as HTML
+  Rendered home/index.html.erb within layouts/application (0.1ms)
+Completed 200 OK in 2ms (Views: 2.1ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+
+
+Started GET "/exception" for 127.0.0.1 at 2012-11-06 09:33:23 -0600
+Processing by HomeController#boom as HTML
+Completed 500 Internal Server Error in 1ms
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+
+
+Started GET "/slow" for 127.0.0.1 at 2012-11-06 09:33:23 -0600
+Processing by HomeController#slow as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 302ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.6ms)  INSERT INTO "users" ("created_at", "email", "password", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Tue, 06 Nov 2012 15:33:23 UTC +00:00], ["email", "foo@foo.com"], ["password", "wow"], ["updated_at", Tue, 06 Nov 2012 15:33:23 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'foo@foo.com' LIMIT 1
+   (0.0ms)  SAVEPOINT active_record_1
+   (0.4ms)  UPDATE "users" SET "password" = 'new password', "updated_at" = '2012-11-06 15:33:23.405283' WHERE "users"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  DELETE FROM "users" WHERE "users"."id" = ?  [["id", 1]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.5ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreateUsers (20120719231810)
+   (0.1ms)  begin transaction
+
+
+Started GET "/custom" for 127.0.0.1 at 2012-11-06 10:06:37 -0600
+Processing by HomeController#custom as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 36ms (Views: 11.4ms | ActiveRecord: 0.3ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+
+
+Started GET "/custom" for 127.0.0.1 at 2012-11-06 10:06:38 -0600
+Processing by HomeController#custom as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 1ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+
+
+Started GET "/custom" for 127.0.0.1 at 2012-11-06 10:06:38 -0600
+Processing by HomeController#custom as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 1ms (Views: 0.4ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (6.4ms)  INSERT INTO "users" ("created_at", "email", "password", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Tue, 06 Nov 2012 16:06:39 UTC +00:00], ["email", "foo@foo.com"], ["password", "wow"], ["updated_at", Tue, 06 Nov 2012 16:06:39 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Rendered user_mailer/welcome_email.text.erb (3.5ms)
+
+Sent mail to foo@foo.com (50ms)
+Date: Tue, 06 Nov 2012 10:06:39 -0600
+From: from@librato-rails.com
+To: foo@foo.com
+Message-ID: <5099358fcf239_24063ff04d434cd4135@Arcas.local.mail>
+Subject: Why Howdy!
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+This is a sample email, yay!
+   (0.4ms)  rollback transaction
+   (0.1ms)  begin transaction
+
+
+Started GET "/" for 127.0.0.1 at 2012-11-06 10:06:39 -0600
+Processing by HomeController#index as HTML
+  Rendered home/index.html.erb within layouts/application (0.3ms)
+Completed 200 OK in 3ms (Views: 2.7ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/status/204" for 127.0.0.1 at 2012-11-06 10:06:39 -0600
+Processing by StatusController#index as HTML
+  Parameters: {"code"=>"204"}
+  Rendered text template (0.0ms)
+Completed 204 No Content in 2ms (Views: 1.3ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+
+
+Started GET "/" for 127.0.0.1 at 2012-11-06 10:06:39 -0600
+Processing by HomeController#index as HTML
+  Rendered home/index.html.erb within layouts/application (0.1ms)
+Completed 200 OK in 2ms (Views: 1.9ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+
+
+Started GET "/exception" for 127.0.0.1 at 2012-11-06 10:06:39 -0600
+Processing by HomeController#boom as HTML
+Completed 500 Internal Server Error in 1ms
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+
+
+Started GET "/slow" for 127.0.0.1 at 2012-11-06 10:06:39 -0600
+Processing by HomeController#slow as HTML
+  Rendered text template (0.0ms)
+Completed 200 OK in 302ms (Views: 0.6ms | ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.7ms)  INSERT INTO "users" ("created_at", "email", "password", "updated_at") VALUES (?, ?, ?, ?)  [["created_at", Tue, 06 Nov 2012 16:06:40 UTC +00:00], ["email", "foo@foo.com"], ["password", "wow"], ["updated_at", Tue, 06 Nov 2012 16:06:40 UTC +00:00]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  User Load (0.2ms)  SELECT "users".* FROM "users" WHERE "users"."email" = 'foo@foo.com' LIMIT 1
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.4ms)  UPDATE "users" SET "password" = 'new password', "updated_at" = '2012-11-06 16:06:40.219985' WHERE "users"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  DELETE FROM "users" WHERE "users"."id" = ?  [["id", 1]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.4ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.4
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3761291658502898318
+      hash: 3855473348708511701
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3761291658502898318
+      hash: 3855473348708511701
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24