rails_runner 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d4daada8041fb8cb32f31f1abf2213e2b272b1
-  data.tar.gz: 864d7359d31123a2ffdb2014ef7a9490f00870b5
+  metadata.gz: 7fe6d85e7c06db4cc3bbcb423aeb8c1648141f72
+  data.tar.gz: a34cc5a4faa0cf463116520178c39dcf42b098c0
 SHA512:
-  metadata.gz: 6dc7e7f3ae396845b873df5966ca48bcb20735fc3f9280f37c3ccd98475c888f6cd163798715bd4082241a2dc80f3e939adb46ad88a7059b75899407728e95a5
-  data.tar.gz: 4e549cc52732cd1903f36393f3507103d8ab979518fb094e967f7005d1b83413000b04da54c821151207aa9a029c6c17fdc852acbe28f4a409756ee446da9e0e
+  metadata.gz: dbbaf49f496fc5b8f35ecf36f5af2a5917194422f3b5cea1d5c00065f192171b647cd7d3be17e69300034a4fd6d60bb84d67f21f83d9cac440f5bf251faf5cae
+  data.tar.gz: ff5fd166586a9c6236fab17527e667c002cc8b35625372ca7a33615f1e18c1aeb19cca18ecca51afb5b24dba2cca7bcfd0554d19b70c89c2369f00c3b22be6c3

data/lib/rails_runner/railtie.rb

@@ -3,13 +3,11 @@ module RailsRunner
     initializer 'rails_runner.configure' do |app|
       RailsRunner.config = RailsRunner::Config.new(app.root.join('config/railsrunner.yml'))
 
-      Rails.logger.debug RailsRunner.config.to_yaml
+      RailsRunner.logger.debug RailsRunner.config.to_yaml
 
       if RailsRunner.config.active?
-        Instrumenter.start!
-        app.middleware.insert 0, Middleware
-
-        Rails.logger.debug "[RAILSRUNNER] started #{RailsRunner.config.collector_url}"
+        RailsRunner::Subscriber.register
+        RailsRunner.logger.debug "[RAILSRUNNER] started #{RailsRunner.config.collector_url}"
       end
     end
   end

data/lib/rails_runner/subscriber.rb

@@ -0,0 +1,43 @@
+module RailsRunner
+  class Subscriber
+
+    class << self
+      def register
+        ActiveSupport::Notifications.subscribe /process_action/, self.new
+      end
+    end
+
+    def call(*args)
+      event = ActiveSupport::Notifications::Event.new(*args)
+
+      payload  = event.payload
+      endpoint = "#{payload[:controller]}##{payload[:action]}"
+      minute   = event.time.to_i - (event.time.to_i % 60)
+
+      if payload[:exception]
+        trigger_event(minute, gauge(endpoint, 'error'), event.duration)
+        trigger_event(minute, gauge('error'), event.duration)
+      else
+        trigger_event(minute, gauge(endpoint, 'total'), event.duration)
+        trigger_event(minute, gauge(endpoint, 'view'), payload[:view_runtime]) if payload[:view_runtime]
+        trigger_event(minute, gauge(endpoint, 'db'), payload[:db_runtime]) if payload[:db_runtime]
+        trigger_event(minute, gauge(endpoint, 'ext'), payload[:ext_runtime]) if payload[:ext_runtime]
+      end
+      trigger_event(minute, gauge('total'), event.duration)
+    end
+
+    # @return [RailsRunner::Worker]
+    def worker
+      RailsRunner::Worker.instance
+    end
+
+    def trigger_event(minute, gauge, duration)
+      RailsRunner.logger.debug [minute, gauge, duration]
+      worker.push(RailsRunner::Event.new(minute, gauge, duration.to_i))
+    end
+
+    def gauge(*args)
+      args.join('/')
+    end
+  end
+end

data/lib/rails_runner/util.rb

@@ -20,7 +20,7 @@ module RailsRunner
         request.body             = gzipped
         request['Authorization'] = "#{RailsRunner.config.client_id}"
 
-        Rails.logger.debug "uri: #{uri.host}:#{uri.port} #{uri.request_uri}, header: #{RailsRunner.config.client_id} body length: #{gzipped.length}"
+        RailsRunner.logger.debug "uri: #{uri.host}:#{uri.port} #{uri.request_uri}, header: #{RailsRunner.config.client_id} body length: #{gzipped.length}"
 
         http.request(request)
       end

data/lib/rails_runner/version.rb

@@ -1,3 +1,3 @@
 module RailsRunner
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/rails_runner/worker.rb

@@ -1,30 +1,33 @@
 module RailsRunner
   class Worker
-    MUTEX = Mutex.new
+    MUTEX          = Mutex.new
+    FLUSH_PERIOD   = 10.seconds
+    MAX_MULTIPLIER = 5
 
     attr_accessor :requests
 
     class << self
-      def start!
-        return if @instance
+      def instance
+        return @instance if @instance
         MUTEX.synchronize do
           return @instance if @instance
           @instance = new.start
         end
       end
-
-      def instance
-        @instance
-      end
     end
 
     def initialize
-      @queue    = Queue.new
+      @queue = Queue.new
+      @multiplier = 1
       reset
     end
 
     def reset
-      @requests = Hash.new { |h,k| h[k] = Hash.new { |h,k| h[k] = 0 } }
+      @requests = Hash.new do |requests, minutes|
+        requests[minutes] = Hash.new do |minute, gauge|
+          minute[gauge] = {sum: 0, count: 0}
+        end
+      end
     end
 
     def current_minute
@@ -34,41 +37,50 @@ module RailsRunner
 
     def start
       Thread.new do
-        while (request = @queue.pop)
+        while (event = @queue.pop)
           begin
-            case request
-              when Integer
-                @requests[current_minute][request] += 1
+            case event
+              when Event
+                update_event(event)
               when :flush
                 send_to_collector
             end
           rescue Exception => e
-            puts e.message
-            puts e.backtrace.join("\n")
+            RailsRunner.logger.debug ["Event error:", event.inspect, e.message]
           end
         end
       end
+      start_flusher
+
+      self
+    end
+
+    def update_event(event)
+      @requests[event.minute][event.gauge][:sum]   += event.duration
+      @requests[event.minute][event.gauge][:count] += 1
+    end
 
+    def start_flusher
       Thread.new do
         loop do
-          sleep 10.seconds
-          Rails.logger.debug "Sending flush message"
+          sleep @multiplier * FLUSH_PERIOD
           push(:flush)
         end
       end
-
-      self
     end
 
-    def push(request)
-      @queue << request
+    def push(event)
+      @queue << event
     end
 
     def send_to_collector
-      Rails.logger.debug "Sending to collector"
-      Rails.logger.flush
+      RailsRunner.logger.debug "Sending to collector"
 
-      Util.post(requests.to_json)
+      if Util.post(requests.to_json)
+        @multiplier = 1
+      else
+        @multiplier += 1 if @multiplier < MAX_MULTIPLIER
+      end
 
       reset
     end

data/lib/rails_runner.rb

@@ -1,9 +1,9 @@
-require 'beefcake'
-
 module RailsRunner
+  Event = Struct.new(:minute, :gauge, :duration)
+
   require 'rails_runner/util'
-  require 'rails_runner/instrumenter'
   require 'rails_runner/middleware'
+  require 'rails_runner/subscriber'
   require 'rails_runner/railtie'
   require 'rails_runner/worker'
   require 'rails_runner/config'
@@ -17,4 +17,10 @@ module RailsRunner
     @config || RailsRunner::Config.new(Rails.root.join('config/railsrunner.yml'))
   end
   module_function :config
+
+  class << self
+    def logger
+      @logger ||= Logger.new('log/rails_runner.log')
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_runner
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Benoist Claassen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,20 +24,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: beefcake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -60,9 +46,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rails_runner/config.rb
-- lib/rails_runner/instrumenter.rb
 - lib/rails_runner/middleware.rb
 - lib/rails_runner/railtie.rb
+- lib/rails_runner/subscriber.rb
 - lib/rails_runner/util.rb
 - lib/rails_runner/version.rb
 - lib/rails_runner/worker.rb

data/lib/rails_runner/instrumenter.rb

@@ -1,29 +0,0 @@
-module RailsRunner
-  class Instrumenter
-    MUTEX = Mutex.new
-
-    class << self
-      def start!
-        return @instance if @instance
-
-        MUTEX.synchronize do
-          return @instance if @instance
-          @instance = new.start
-        end
-      end
-
-      def instance
-        @instance
-      end
-    end
-
-    def start
-      @worker     = Worker.start!
-      self
-    end
-
-    def publish(time)
-      @worker.push(time)
-    end
-  end
-end