metrics_machine 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 959afc0e7a0386b750f3abbb92cd4e289ddd0d1a
-  data.tar.gz: 27dc436065b5622347edb567da5e52856ba67023
+  metadata.gz: d63e2c33f29fd0071d4475d746503353ad13bcb3
+  data.tar.gz: c9dee614e7817bef5e0b91a2bc620983b54134eb
 SHA512:
-  metadata.gz: 0943e9aafb8ffac93ec84444a9e9eec05754d72a95210767a016b1133bcdc5121a9402bb6eeb72674e48ce0fc633b2c2bf618d472637fb1717c4b94218fea9f3
-  data.tar.gz: 3006307a9676afad7c3b4eed8e7296737a6fe16b2cd31b01afab4250238bf9e778f90f52c20307e6a8ea34fca229801eb4b2e119d0c2f3384e8b116a050d7c17
+  metadata.gz: a69a717a85bff5f6965e787a83236e36f3285bc0f747949916743b5cae7bdbcb298374edebec0d78f63da59e3c3639bf9d12e2eb90840393568f8c08ec277282
+  data.tar.gz: 681f7fdacd6e60f680559054408dab40eae050646fb368987511c8ad3f12d06ae9c5b24053d4f1f168f9460f2bc1e0370b9e23c58d8b241a4923bb215305409b

data/config/statsd.yml

@@ -0,0 +1,7 @@
+default: &DEFAULT
+  host: <%= ENV['STATSD_URL'] || 'localhost' %>
+  port: <%= ENV['STATSD_PORT'] || 8125 %>
+
+development: *DEFAULT
+test: *DEFAULT
+production: *DEFAULT

data/lib/metrics_machine.rb

@@ -2,37 +2,41 @@ require "metrics_machine/version"
 require "metrics_machine/monitor"
 require "statsd"
 require "eventmachine"
+require "erb"
 require "psych"
 
 module MetricsMachine
   autoload :Monitor, "metrics_machine/monitor"
-  autoload :Railtie, "metrics_machine/railtie"
+  require "metrics_machine/railtie" if defined? Rails
+  autoload :Mysql, "metrics_machine/mysql"
 
   def self.start options = {}, &block
+    monitor.configure &block if block_given?
 
-    thread = if defined?(PhusionPassenger)
-               PhusionPassenger.on_event(:starting_worker_process) do |forked|
-                 if forked && EM.reactor_running?
-                   EM.stop
-                 end
-                 Thread.new { EM.run }
-                 die_gracefully_on_signal
-               end
-             else
-               # faciliates debugging
-               Thread.abort_on_exception = true
-               # just spawn a thread and start it up
-               Thread.new {
-                 EM.run
-               }
-             end
+    p = lambda { EM.run { monitor.run! } }
+    if defined?(PhusionPassenger)
+      PhusionPassenger.on_event(:starting_worker_process) do |forked|
+        if forked && EM.reactor_running?
+          EM.stop
+        end
+    
+        Thread.new &p
+        die_gracefully_on_signal
+      end
+    else
+      # faciliates debugging
+      Thread.abort_on_exception = true
+      # just spawn a thread and start it up
+      Thread.new &p
+    end
+  end
 
-    Monitor.new reporter, options, &block if block_given?
-    thread
+  def self.monitor
+    @monitor ||= Monitor.new reporter
   end
 
-  def self.configure options = {}, &block
-    Monitor.new reporter, options, &block if block_given?
+  def self.configure &block
+    monitor.configure &block
   end
 
   def self.die_gracefully_on_signal
@@ -47,14 +51,14 @@ module MetricsMachine
   private
   def self.reporter_config
     @reporter_config ||= begin
-      path = if has_rails? and File.exists? "#{Rails.root}/config/statsd.yml"
+      path = if defined? Rails and File.exists? "#{Rails.root}/config/statsd.yml"
                "#{Rails.root}/config/statsd.yml"
              else
-               File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "config", "statsd.yml"))
+               File.expand_path(File.join(File.dirname(__FILE__), "..", "config", "statsd.yml"))
              end
-      data = Psych.load_file(path)
+      data = Psych.load(ERB.new(IO.read(path)).result(binding))
 
-      if has_rails?
+      if defined? Rails
         data[Rails.env]
       else
         data["default"]
@@ -62,7 +66,4 @@ module MetricsMachine
     end
   end
 
-  def self.has_rails?
-    const_defined? "Rails"
-  end
 end

data/lib/metrics_machine/monitor.rb

@@ -4,14 +4,25 @@ require 'active_support/inflector/transliterate'
 module MetricsMachine
   class Monitor
 
-    attr_reader :prefix, :monitors, :reporter
+    attr_reader :monitors, :reporter
 
     def initialize reporter, options = {}, &block
       @reporter = reporter
       @monitors = {}
       @prefix = options.fetch(:prefix, self.class.default_prefix)
+      configure &block if block_given?
+    end
+
+    def prefix *args
+      if args.empty?
+        @prefix
+      else
+        @prefix = args.first
+      end
+    end
+
+    def configure &block
       instance_eval &block
-      run!
     end
 
     def run!

data/lib/metrics_machine/mysql.rb

@@ -1,21 +1,22 @@
 module MetricsMachine
   class Mysql
-    INTERVAL = 15
 
-    attr_reader :connection, :options
+    attr_reader :base, :options
 
-    def initialize connection, *args
+    def initialize base, *args
       @options = args.extract_options!
-      @connection = connection
+      @base = base
     end
 
     def interval
-      self.class.INTERVAL
+      15
     end
 
     def statistics
-      fetch_status.each do |k,v|
-        fetch_status[k] = case v
+      status = fetch_status
+
+      status.each do |k,v|
+        status[k] = case v
         when "OFF", "NULL", "NONE"
           0
         when "ON", "TRUE"
@@ -29,11 +30,11 @@ module MetricsMachine
     private
 
     def fetch_status
-      Hash[*connection.execute("SHOW GLOBAL STATUS").map.to_a.flatten]
+      Hash[*base.connection.execute("SHOW GLOBAL STATUS").map.to_a.flatten]
     end
 
     def fetch_variables
-      Hash[*connection.execute("SHOW GLOBAL VARIABLES").map.to_a.flatten]
+      Hash[*base.connection.execute("SHOW GLOBAL VARIABLES").map.to_a.flatten]
     end
   end
 end

data/lib/metrics_machine/railtie.rb

@@ -1,16 +1,10 @@
 module MetricsMachine
   class Railtie < Rails::Railtie
 
-    if Rails.env.production?
-      initializer "metricsmachine.start_em" do
-        unless EM.reactor_running?
-          MetricsMachine.start
-        end
-      end
-
-      initializer "metricsmachine.configure_rails_initialization" do
-        MetricsMachine.configure do
-          monitor :mysql, ActiveRecord::Base.connection if ActiveRecord::Base.connection.is_a? ActiveRecord::ConnectionAdapters::Mysql2Adapter
+    if Rails.env.production? || ENV['METRICS'] == "true"
+      initializer "metricsmachine.initialization" do
+        MetricsMachine.start do
+          monitor :mysql, ActiveRecord::Base if ActiveRecord::Base.connection.is_a? ActiveRecord::ConnectionAdapters::Mysql2Adapter
         end
       end
     end

data/lib/metrics_machine/version.rb

@@ -1,3 +1,3 @@
 module MetricsMachine
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metrics_machine
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: statsd-ruby
@@ -108,6 +108,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- config/statsd.yml
 - lib/metrics_machine.rb
 - lib/metrics_machine/monitor.rb
 - lib/metrics_machine/mysql.rb