librato-rack 0.4.0 → 0.4.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### Version 0.4.1
+* Support a pre-configured tracker object
+* Make log-prefix configurable
+* Break pid-locking out of startup checks
+
 ### Version 0.4.0
 * Add HTTP method (GET, POST) metrics
 * Add log buffering support

data/lib/librato/rack.rb

@@ -41,14 +41,14 @@ module Librato
 
     def initialize(app, options={})
       old_style = false
-      if options.respond_to?(:tracker) # old-style single argument
+      if options.respond_to?(:log_level) # old-style single argument
         config = options
         old_style = true
       else
         config = options.fetch(:config, Configuration.new)
       end
       @app, @config = app, config
-      @tracker = Tracker.new(@config)
+      @tracker = @config.tracker || Tracker.new(@config)
       Librato.register_tracker(@tracker) # create global reference
 
       if old_style

data/lib/librato/rack/configuration.rb

@@ -13,8 +13,8 @@ module Librato
       EVENT_MODES = [:eventmachine, :synchrony]
 
       attr_accessor :user, :token, :autorun, :api_endpoint, :tracker,
-                    :source_pids, :log_level, :flush_interval, :log_target,
-                    :disable_rack_metrics
+                    :source_pids, :log_level, :log_prefix, :log_target,
+                    :disable_rack_metrics, :flush_interval
       attr_reader :prefix, :source, :deprecations
 
       def initialize
@@ -23,18 +23,11 @@ module Librato
         self.api_endpoint = Librato::Metrics.api_endpoint
         self.flush_interval = 60
         self.source_pids = false
+        self.log_prefix = '[librato-rack] '
         @listeners = []
         @deprecations = []
 
-        # check environment
-        self.user = ENV['LIBRATO_USER'] || ENV['LIBRATO_METRICS_USER']
-        self.token = ENV['LIBRATO_TOKEN'] || ENV['LIBRATO_METRICS_TOKEN']
-        self.autorun = detect_autorun
-        self.prefix = ENV['LIBRATO_PREFIX'] || ENV['LIBRATO_METRICS_PREFIX']
-        self.source = ENV['LIBRATO_SOURCE'] || ENV['LIBRATO_METRICS_SOURCE']
-        self.log_level = ENV['LIBRATO_LOG_LEVEL'] || :info
-        self.event_mode = ENV['LIBRATO_EVENT_MODE']
-        check_deprecations
+        load_configuration
       end
 
       def event_mode
@@ -57,6 +50,19 @@ module Librato
         !!@explicit_source
       end
 
+      # check environment variables and capture current state
+      # for configuration
+      def load_configuration
+        self.user = ENV['LIBRATO_USER'] || ENV['LIBRATO_METRICS_USER']
+        self.token = ENV['LIBRATO_TOKEN'] || ENV['LIBRATO_METRICS_TOKEN']
+        self.autorun = detect_autorun
+        self.prefix = ENV['LIBRATO_PREFIX'] || ENV['LIBRATO_METRICS_PREFIX']
+        self.source = ENV['LIBRATO_SOURCE'] || ENV['LIBRATO_METRICS_SOURCE']
+        self.log_level = ENV['LIBRATO_LOG_LEVEL'] || :info
+        self.event_mode = ENV['LIBRATO_EVENT_MODE']
+        check_deprecations
+      end
+
       def prefix=(prefix)
         @prefix = prefix
         @listeners.each { |l| l.prefix = prefix }

data/lib/librato/rack/logger.rb

@@ -14,7 +14,7 @@ module Librato
       def initialize(outlet=nil)
         @buffer = []
         self.outlet = outlet
-        self.prefix = '[librato-rack] '
+        self.prefix = ''
       end
 
       # @example Simple logging

data/lib/librato/rack/tracker.rb

@@ -25,7 +25,7 @@ module Librato
       # thread will not pass with the fork
       def check_worker
         return if @worker # already running
-        return if !should_start?
+        return unless start_worker?
         log(:debug) { "config: #{config.dump}" }
         @pid = $$
         log(:debug) { ">> starting up worker for pid #{@pid}..." }
@@ -65,6 +65,23 @@ module Librato
         config.source_pids ? "#{source}.#{$$}" : source
       end
 
+      # given current state, should the tracker start a reporter thread?
+      def should_start?
+        if !config.user || !config.token
+          # don't show this unless we're debugging, expected behavior
+          log :debug, 'halting: credentials not present.'
+        elsif config.autorun == false
+          log :debug, 'halting: LIBRATO_AUTORUN disabled startup'
+        elsif qualified_source !~ SOURCE_REGEX
+          log :warn, "halting: '#{qualified_source}' is an invalid source name."
+        elsif on_heroku && !config.explicit_source?
+          log :warn, 'halting: source must be provided in configuration.'
+        else
+          return true
+        end
+        false
+      end
+
       # change output stream for logging
       def update_log_target(target)
         logger.outlet = target
@@ -110,6 +127,7 @@ module Librato
         return @logger if @logger
         @logger = Logger.new(config.log_target)
         @logger.log_level = config.log_level
+        @logger.prefix    = config.log_prefix
         @logger
       end
 
@@ -129,34 +147,31 @@ module Librato
         RUBY_DESCRIPTION.split[0]
       end
 
-      def should_start?
-        return false if @pid_checked == $$ # only check once per process
-        @pid_checked = $$
-        if !config.user || !config.token
-          # don't show this unless we're debugging, expected behavior
-          log :debug, 'halting: credentials not present.'
-        elsif config.autorun == false
-          log :debug, 'halting: LIBRATO_AUTORUN disabled startup'
-        elsif qualified_source !~ SOURCE_REGEX
-          log :warn, "halting: '#{qualified_source}' is an invalid source name."
-        elsif on_heroku && !config.explicit_source?
-          log :warn, 'halting: source must be provided in configuration.'
-        else
-          return true
-        end
-        false
-      end
-
       def source
         @source ||= (config.source || Socket.gethostname).downcase
       end
 
+      # should we spin up a worker? wrap this in a process check
+      # so we only actually check once per process. this allows us
+      # to check again if the process forks.
+      def start_worker?
+        if @pid_checked == $$
+          false
+        else
+          @pid_checked = $$
+          should_start?
+        end
+      end
+
       def user_agent
-        ua_chunks = []
-        ua_chunks << "librato-rack/#{Librato::Rack::VERSION}"
+        ua_chunks = [version_string]
         ua_chunks << "(#{ruby_engine}; #{RUBY_VERSION}p#{RUBY_PATCHLEVEL}; #{RUBY_PLATFORM})"
         ua_chunks.join(' ')
       end
+
+      def version_string
+        "librato-rack/#{Librato::Rack::VERSION}"
+      end
     end
   end
 end

data/lib/librato/rack/version.rb

@@ -1,5 +1,5 @@
 module Librato
   class Rack
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

data/test/unit/rack/logger_test.rb

@@ -72,7 +72,7 @@ module Librato
       end
 
       def test_log_prefix
-        assert_equal '[librato-rack] ', @logger.prefix
+        assert_equal '', @logger.prefix
 
         @logger.prefix = '[test prefix] '
         @logger.log :error, 'an error message'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-rack
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -37,7 +37,7 @@ cert_chain:
   bktaNmhlblFBRjFDSDk2WmNxY0pIMTc5UzJ0SWlLRE04a2VlUklVT1BDM1dU
   MGZhb2svMgpnQTJvemRyODUxYy9uQT09Ci0tLS0tRU5EIENFUlRJRklDQVRF
   LS0tLS0K
-date: 2013-08-19 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librato-metrics
@@ -131,7 +131,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3276523900394881660
+      hash: 3171702989332283637
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3276523900394881660
+      hash: 3171702989332283637
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23