alicorn 0.3.1 → 0.4.0

data/.ruby-gemset

@@ -0,0 +1 @@
+alicorn

data/Gemfile

@@ -1,11 +1,11 @@
 source "http://rubygems.org"
 
-gem "curb", "~> 0.8.0"
+gem "raindrops", ">= 0.5.0"
 
 group :development do
   gem "shoulda", "~> 3.0.1"
   gem "rdoc", "~> 3.12"
-  gem "bundler", "~> 1.1.3"
+  gem "bundler", "~> 1.3.5"
   gem "jeweler", "~> 1.8.3"
   gem "mocha", "~> 0.11.4"
   gem "simplecov", "~> 0.6.4", :require => false, :platforms => :ruby_19

data/Gemfile.lock

@@ -1,7 +1,6 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    curb (0.8.0)
     git (1.2.5)
     jeweler (1.8.3)
       bundler (~> 1.0)
@@ -13,6 +12,7 @@ GEM
     mocha (0.11.4)
       metaclass (~> 0.0.1)
     multi_json (1.3.4)
+    raindrops (0.6.1)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -30,10 +30,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.1.3)
-  curb (~> 0.8.0)
+  bundler (~> 1.3.5)
   jeweler (~> 1.8.3)
   mocha (~> 0.11.4)
+  raindrops (>= 0.5.0)
   rdoc (~> 3.12)
   shoulda (~> 3.0.1)
   simplecov (~> 0.6.4)

data/README.rdoc

@@ -1,6 +1,8 @@
-= Alicorn: Auto-scaler for Unicorn webserver
+= Alicorn: Auto-scaler for Unicorn webserver 
+{<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/bensomers/alicorn]
+{<img src="https://gemnasium.com/bensomers/alicorn.png" alt="Dependency Status" />}[https://gemnasium.com/bensomers/alicorn]
 
-An experimental auto-scaler for Eric Wong's {Unicorn}[http://unicorn.bogomips.org] 
+An experimental auto-scaler for the {Unicorn}[http://unicorn.bogomips.org] 
 webserver. Designed for Unicorn webservers running with the {Raindrops}[raindrops.bogomips.org]
 middleware enabled. It depends on the "active" and "queued" fields reported by
 Raindrops, and so only works on Linux.

data/Rakefile

@@ -35,22 +35,4 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-# require 'rcov/rcovtask'
-# Rcov::RcovTask.new do |test|
-#   test.libs << 'test'
-#   test.pattern = 'test/**/test_*.rb'
-#   test.verbose = true
-#   test.rcov_opts << '--exclude "gems/*"'
-# end
-
 task :default => :test
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "alicorn #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/bin/alicorn

@@ -7,9 +7,8 @@ require 'alicorn'
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Alicorn is a tool for auto-scaling unicorn worker counts.
-It relies on unicorn's built-in Raindrops middleware (so make sure you have
-enabled it). It computes rough load scores based on separately averaged
-data sets. \n\nUsage: alicorn [options]"
+It computes rough load scores based on separately averaged data sets. 
+\n\nUsage: alicorn [options]"
 
   opts.on('-h', '--help', 'Display this screen') do
     puts opts
@@ -37,8 +36,12 @@ data sets. \n\nUsage: alicorn [options]"
     options[:target_ratio] = v
   end
 
-  opts.on("--url [URL]", String, "raindrops URL to check, defaults to 127.0.0.1/_raindrops") do |v|
-    options[:url] = v
+  opts.on("--listener-type", String, "the type of listener to use, tcp or unix -- defaults to tcp") do |v|
+    options[:listener_type] = v
+  end
+
+  opts.on("--listener-address", String, "the listener address to use - defaults to 0.0.0.0:80") do |v|
+    options[:listener_address] = v
   end
 
   opts.on("--sample-count [N]", Integer, "number of data points to check before scaling") do |v|

data/lib/alicorn/log_parser.rb

@@ -2,6 +2,8 @@ module Alicorn
   class LogParser
     attr_accessor :filename, :samples
 
+    SAMPLE_REGEX = /(?<sample_type>active|queued|calling|writing):\[(?<values>.+)\]/
+
     def initialize(file = "alicorn.log")
       self.filename = file
       self.samples  = []
@@ -10,24 +12,26 @@ module Alicorn
     def parse
       f = File.open(filename)
       f.each do |line|
-       if line.match(/Sampling/)
-          @sample_hash = {} # this will reset every sample
-        elsif line.match(/calling:\[(.+)\]/)
-          data = $1.split(", ").map(&:to_i)
-          @sample_hash[:calling] = (DataSet.new << data).flatten
-        elsif line.match(/writing:\[(.+)\]/)
-          data = $1.split(", ").map(&:to_i)
-          @sample_hash[:writing] = (DataSet.new << data).flatten
-        elsif line.match(/active:\[(.+)\]/)
-          data = $1.split(", ").map(&:to_i)
-          @sample_hash[:active] = (DataSet.new << data).flatten
-        elsif line.match(/queued:\[(.+)\]/)
-          data = $1.split(", ").map(&:to_i)
-          @sample_hash[:queued] = (DataSet.new << data).flatten
-          samples << @sample_hash # store the old sample
-        end
+        sample_line(line)
       end
       samples
     end
+
+  private
+
+    # Not suitable for calling in isolation, since an actual data sample
+    # spans 5 lines in the log file. This method checks for lines indicating
+    # either the beginning or end of a sample, or for data lines in the middle.
+    def sample_line(line)
+      if line.match(/Sampling/)
+        @sample_hash = {} # reset for the new sample
+      elsif match_result = line.match(SAMPLE_REGEX)
+        data = match_result[:values].split(", ").map(&:to_i)
+        @sample_hash[match_result[:sample_type].to_sym] = (DataSet.new << data).flatten
+      elsif line.match(/target calculated at:/)
+        samples << @sample_hash # store the old sample
+      end
+    end
+
   end
 end

data/lib/alicorn/scaler.rb

@@ -1,4 +1,4 @@
-require 'curl'
+require 'raindrops'
 require 'logger'
 require 'alicorn/dataset'
 require 'alicorn/errors'
@@ -6,7 +6,8 @@ require 'alicorn/errors'
 module Alicorn
   class Scaler
     attr_accessor :min_workers, :max_workers, :target_ratio, :buffer,
-      :raindrops_url, :delay, :sample_count, :app_name, :dry_run, :logger
+      :listener_type, :listener_address, :delay, :sample_count, :app_name,
+      :dry_run, :logger
 
     attr_reader :signal_delay
 
@@ -15,7 +16,8 @@ module Alicorn
       @max_workers        = options[:max_workers]
       @target_ratio       = options[:target_ratio]        || 1.3
       @buffer             = options[:buffer]              || 2
-      @raindrops_url      = options[:url]                 || "http://127.0.0.1/_raindrops"
+      @listener_type      = options[:listener_type]       || "tcp"
+      @listener_address   = options[:listener_address]    || "0.0.0.0:80"
       @delay              = options[:delay]               || 1
       @sample_count       = options[:sample_count]        || 30
       @app_name           = options[:app_name]            || "unicorn"
@@ -82,23 +84,19 @@ module Alicorn
 
     def collect_data
       logger.debug "Sampling #{sample_count} times at #{delay} second intervals"
-      calling, writing, active, queued = DataSet.new, DataSet.new, DataSet.new, DataSet.new
+      active, queued = DataSet.new, DataSet.new
       sample_count.times do
-        raindrops = get_raindrops(raindrops_url)
-        calling << $1.to_i if raindrops.detect { |line| line.match(/calling: ([0-9]+)/) }
-        writing << $1.to_i if raindrops.detect { |line| line.match(/writing: ([0-9]+)/) }
-        active  << $1.to_i if raindrops.detect { |line| line.match(/active: ([0-9]+)/) }
-        queued  << $1.to_i if raindrops.detect { |line| line.match(/queued: ([0-9]+)/) }
+        stats = Raindrops::Linux.send(:"#{listener_type}_listener_stats", listener_address)[listener_address]
+        active << stats.active
+        queued << stats.queued
         sleep(delay)
       end
 
       logger.debug "Collected:"
-      logger.debug "calling:#{calling}"
-      logger.debug "writing:#{writing}"
       logger.debug "active:#{active}"
       logger.debug "queued:#{queued}"
 
-      {:calling => calling, :writing => writing, :active => active, :queued => queued}
+      {:active => active, :queued => queued}
     end
 
   private
@@ -136,9 +134,5 @@ module Alicorn
     def send_signal(master_pid, sig)
       Process.kill(sig, master_pid)
     end
-
-    def get_raindrops(url)
-      Curl::Easy.http_get(url).body_str.split("\n")
-    end
   end
 end

data/lib/alicorn/version.rb

@@ -1,3 +1,3 @@
 module Alicorn
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/test/fixtures/sample.alicorn.log

@@ -1,14 +1,10 @@
 D, [2012-05-17T14:45:02.092344 #26889] DEBUG -- : Sampling 3 times
 D, [2012-05-17T14:45:32.901373 #26889] DEBUG -- : Collected:
-D, [2012-05-17T14:45:32.901563 #26889] DEBUG -- : calling:[1, 2, 1]
-D, [2012-05-17T14:45:32.901960 #26889] DEBUG -- : writing:[2, 1, 2]
 D, [2012-05-17T14:45:32.902297 #26889] DEBUG -- : active:[1, 4, 3]
 D, [2012-05-17T14:45:32.902606 #26889] DEBUG -- : queued:[0, 2, 1]
 D, [2012-05-17T14:45:32.902944 #26889] DEBUG -- : target calculated at: 4, worker count at 2
 D, [2012-05-17T14:50:01.575204 #27727] DEBUG -- : Sampling 5 times
 D, [2012-05-17T14:50:31.697833 #27727] DEBUG -- : Collected:
-D, [2012-05-17T14:50:31.698001 #27727] DEBUG -- : calling:[11, 12, 11, 13, 14]
-D, [2012-05-17T14:50:31.698452 #27727] DEBUG -- : writing:[12, 11, 12, 14, 13]
 D, [2012-05-17T14:50:31.698792 #27727] DEBUG -- : active:[11, 14, 13, 12, 11]
 D, [2012-05-17T14:50:31.699107 #27727] DEBUG -- : queued:[10, 12, 11, 11, 12]
 D, [2012-05-17T14:50:31.699448 #27727] DEBUG -- : target calculated at: 14, worker count at 12

data/test/test_log_parser.rb

@@ -9,13 +9,9 @@ class TestLogParser < Test::Unit::TestCase
 
   context "#parse" do
     should "correctly read log file" do
-      expected = [ { :calling => DataSet.new([1,2,1]),
-                     :writing => DataSet.new([2,1,2]),
-                     :active  => DataSet.new([1,4,3]),
+      expected = [ { :active  => DataSet.new([1,4,3]),
                      :queued  => DataSet.new([0,2,1]) },
-                   { :calling => DataSet.new([11, 12, 11, 13, 14]),
-                     :writing => DataSet.new([12, 11, 12, 14, 13]),
-                     :active  => DataSet.new([11, 14, 13, 12, 11]),
+                   { :active  => DataSet.new([11, 14, 13, 12, 11]),
                      :queued  => DataSet.new([10, 12, 11, 11, 12]) }
                  ]
 

data/test/test_scaler.rb

@@ -5,9 +5,9 @@ class TestScaler < Test::Unit::TestCase
   def setup
     @scaler = Alicorn::Scaler.new(:delay => 0)
 
-    # stub out external call
-    raindrops = "calling: 3\nwriting: 1\n/tmp/cart.socket active: 4\n/tmp/cart.socket queued: 0\n"
-    Curl::Easy.stubs(:http_get).returns(stub(:body_str => raindrops))
+    # stub out stats gathering
+    mock_struct = stub_everything(:active => 4, :queued => 0)
+    Raindrops::Linux.stubs(:tcp_listener_stats).returns({"0.0.0.0:80" =>  mock_struct})
 
     # enable us to test private methods, for the complicated ones
     class << @scaler
@@ -194,9 +194,7 @@ class TestScaler < Test::Unit::TestCase
   context "#collect_data" do
     should "return the correct data" do
       data = @scaler.send(:collect_data)
-      expected_data = { :calling => [3]*30,
-                        :writing => [1]*30,
-                        :active  => [4]*30,
+      expected_data = { :active  => [4]*30,
                         :queued  => [0]*30 }
       assert_equal expected_data, data
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alicorn
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: curb
-  requirement: &70277797703480 !ruby/object:Gem::Requirement
+  name: raindrops
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70277797703480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70277797702640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70277797702640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70277797701780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +53,31 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70277797701780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70277797701060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.3.5
   type: :development
   prerelease: false
-  version_requirements: *70277797701060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70277797700120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70277797700120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70277797715880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 0.11.4
   type: :development
   prerelease: false
-  version_requirements: *70277797715880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.4
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70277797715200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +117,12 @@ dependencies:
         version: 0.6.4
   type: :development
   prerelease: false
-  version_requirements: *70277797715200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.4
 description: Highly configurable dumb auto-scaler for managing unicorn web servers
 email: somers.ben@gmail.com
 executables:
@@ -99,6 +134,7 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .document
+- .ruby-gemset
 - CHANGELOG.txt
 - Gemfile
 - Gemfile.lock
@@ -136,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4049117903748411097
+      hash: 2717373348284717997
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -145,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Standalone auto-scaler for unicorn