metrix 0.0.4 → 0.0.5

data/lib/metrix/cli.rb

@@ -4,7 +4,9 @@ require "metrix/mongodb"
 require "metrix/nginx"
 require "metrix/system"
 require "metrix/load"
+require "metrix/fpm"
 require "logger"
+require "fileutils"
 
 module Metrix
   class CLI
@@ -19,15 +21,58 @@ module Metrix
     end
 
     def run
-      opts.parse(@args)
       Metrix.logger.level = log_level
+      action = opts.parse(@args).first
+      case action
+      when "start"
+        if running?
+          logger.warn "refuse to run. seems that #{pid_path} exists!"
+          abort "not allowed to run" if running?
+        end
+        pid = Process.fork do
+          start
+        end
+        sleep 1
+        Process.detach(pid)
+      when "status"
+        if File.exists?(pid_path)
+          logger.debug "#{pid_path} exists"
+          puts "STATUS: running with pid #{File.read(pid_path).strip}"
+        else
+          logger.debug "#{pid_path} does not exist"
+          puts "STATUS: not running"
+        end
+      when "stop"
+        abort "not running!" if !running?
+        pid = File.read(pid_path).strip
+        logger.info "killing pid #{pid}"
+        system "kill #{pid}"
+        puts "killed #{pid}"
+      else
+        logger.warn "action #{action} unknown!"
+        abort "action #{action} unknown!"
+      end
+    end
+
+    def delete_pidfile!
+      logger.info "deleteing pidfile #{pid_path}"
+      FileUtils.rm_f(pid_path)
+    end
+
+    def start
       if self.reporter.nil?
         puts "ERROR: at least one reporter must be specified"
         abort opts.to_s
       end
+      Signal.trap("TERM") do
+        logger.info "terminating..."
+        $running = false
+      end
+      $running = true
       cnt = -1
       started = Time.now
-      while true
+      write_pidfile!(Process.pid)
+      while $running
         begin
           cnt += 1
           now = Time.now.utc
@@ -49,6 +94,12 @@ module Metrix
             end
           end
 
+          if fpm?
+            fetch_metrix :fpm do
+              reporter << Metrix::FPM.new(fpm_status)
+            end
+          end
+
           if system?
             fetch_metrix :system do
               reporter << Metrix::System.new(File.read("/proc/stat"))
@@ -67,7 +118,7 @@ module Metrix
           end
           reporter.flush
         rescue SystemExit
-          exit
+          $running = false
         rescue => err
           Metrix.logger.error "#{err.message}"
           Metrix.logger.error "#{err.backtrace.inspect}"
@@ -81,6 +132,24 @@ module Metrix
           end
         end
       end
+      delete_pidfile!
+    end
+
+    def write_pidfile!(pid)
+      logger.info "writing #{pid} to #{pid_path}"
+      File.open(pid_path, "w") { |f| f.print(pid) }
+    end
+
+    def allowed_to_run?
+      !running?
+    end
+
+    def pid_path
+      "/var/run/metrix.pid"
+    end
+
+    def running?
+      File.exists?(pid_path)
     end
 
     def log_level
@@ -99,6 +168,10 @@ module Metrix
       !!@mongodb
     end
 
+    def fpm?
+      !!@fpm
+    end
+
     def nginx?
       !!@nginx
     end
@@ -111,8 +184,11 @@ module Metrix
       get_url "http://127.0.0.1:28017/serverStatus"
     end
 
+    def fpm_status
+      get_url "http://127.0.0.1:9001/fpm-status"
+    end
+
     def nginx_status
-      Metrix.logger.info "fetching mongodb metrix"
       get_url "http://127.0.0.1:8000/"
     end
 
@@ -154,6 +230,10 @@ module Metrix
           exit
         end
 
+        o.on("--fpm") do
+          @fpm = true
+        end
+
         o.on("--nginx") do
           @nginx = true
         end
@@ -179,7 +259,6 @@ module Metrix
         o.on("--stdout") do
           require "metrix/reporter/stdout"
           @reporter = Metrix::Reporter::Stdout.new
-          log_to_stdout
         end
 
         o.on("--debug") do

data/lib/metrix/fpm.rb

@@ -0,0 +1,50 @@
+require "metrix/base"
+
+module Metrix
+  class FPM < Base
+    def initialize(data)
+      @data = data
+      @time = Time.now
+    end
+
+    def prefix
+      "fpm"
+    end
+
+    def extract(data)
+      {
+        accepted_conn: accepted_conn,
+        start_since: start_since,
+        accepted_conn: accepted_conn,
+        listen_queue: listen_queue,
+        max_listen_queue: max_listen_queue,
+        listen_queue_len: listen_queue_len,
+        idle_processes: idle_processes,
+        active_processes: active_processes,
+        total_processes: total_processes,
+        max_active_processes: max_active_processes,
+        max_children_reached: max_children_reached,
+        slow_requests: slow_requests,
+      }
+    end
+
+    {
+      "accepted conn" => :accepted_conn,
+      "start since" => :start_since,
+      "accepted conn" => :accepted_conn,
+      "listen queue" => :listen_queue,
+      "max listen queue" => :max_listen_queue,
+      "listen queue len" => :listen_queue_len,
+      "idle processes" => :idle_processes,
+      "active processes" => :active_processes,
+      "total processes" => :total_processes,
+      "max active processes" => :max_active_processes,
+      "max children reached" => :max_children_reached,
+      "slow requests" => :slow_requests,
+    }.each do |from, to|
+      define_method(to) do
+        cast_int(@data[/^#{from}:\s*(\d+)/, 1])
+      end
+    end
+  end
+end

data/lib/metrix/version.rb

@@ -1,3 +1,3 @@
 module Metrix
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/fixtures/php.fpm.status.txt

@@ -0,0 +1,14 @@
+pool:                 www
+process manager:      dynamic
+start time:           03/Jun/2013:16:34:04 +0000
+start since:          29
+accepted conn:        4
+listen queue:         1
+max listen queue:     2
+listen queue len:     128
+idle processes:       1
+active processes:     2
+total processes:      3
+max active processes: 4
+max children reached: 1
+slow requests:        2

data/spec/lib/metrix/cli_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+require "metrix/cli"
+
+describe "Metrix::CLI", :wip do
+  subject(:cli) { Metrix::CLI.new([]) }
+  it { should_not be_nil }
+
+  it { cli.pid_path.should eq("/var/run/metrix.pid") }
+
+  describe "#running?" do
+    before do
+      File.stub(:exists?).with("/var/run/metrix.pid") { false }
+    end
+    it { cli.should_not be_running }
+
+    describe "being running" do
+      before do
+        File.stub(:exists?).with("/var/run/metrix.pid") { true }
+      end
+      it { cli.should be_running }
+    end
+  end
+
+  describe "#allowed_to_run?" do
+    before do
+      cli.stub(:running?) { true }
+    end
+
+    it { should_not be_allowed_to_run }
+  end
+end

data/spec/lib/metrix/fpm_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+require "metrix/fpm"
+
+describe "Metrix::FPM", :wip do
+  let(:data) { FIXTURES_PATH.join("php.fpm.status.txt").read }
+  subject(:fpm) { Metrix::FPM.new(data) }
+  it { should_not be_nil }
+  it { subject.start_since.should eq(29) }
+  it { subject.accepted_conn.should eq(4) }
+  it { subject.listen_queue.should eq(1) }
+  it { subject.idle_processes.should eq(1) }
+
+  it { subject.prefix.should eq("fpm") }
+
+  describe "#extract" do
+    subject(:extract) { fpm.extract(1) }
+    it { should be_kind_of(Hash) }
+    it { subject[:accepted_conn].should eq(4) }
+    it { subject[:active_processes].should eq(2) }
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metrix
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: SyslogLogger
@@ -93,6 +93,7 @@ files:
 - lib/metrix/base.rb
 - lib/metrix/cli.rb
 - lib/metrix/elastic_search.rb
+- lib/metrix/fpm.rb
 - lib/metrix/graphite.rb
 - lib/metrix/json.rb
 - lib/metrix/load.rb
@@ -110,9 +111,12 @@ files:
 - spec/fixtures/loadavg.txt
 - spec/fixtures/mongo_server_status.json
 - spec/fixtures/nginx.status.txt
+- spec/fixtures/php.fpm.status.txt
 - spec/fixtures/proc.26928.txt
 - spec/fixtures/proc.stat.txt
+- spec/lib/metrix/cli_spec.rb
 - spec/lib/metrix/elastic_search_spec.rb
+- spec/lib/metrix/fpm_spec.rb
 - spec/lib/metrix/graphite_spec.rb
 - spec/lib/metrix/load_spec.rb
 - spec/lib/metrix/metric_spec.rb
@@ -152,9 +156,12 @@ test_files:
 - spec/fixtures/loadavg.txt
 - spec/fixtures/mongo_server_status.json
 - spec/fixtures/nginx.status.txt
+- spec/fixtures/php.fpm.status.txt
 - spec/fixtures/proc.26928.txt
 - spec/fixtures/proc.stat.txt
+- spec/lib/metrix/cli_spec.rb
 - spec/lib/metrix/elastic_search_spec.rb
+- spec/lib/metrix/fpm_spec.rb
 - spec/lib/metrix/graphite_spec.rb
 - spec/lib/metrix/load_spec.rb
 - spec/lib/metrix/metric_spec.rb