flare-tools 0.0.1 → 0.1.0

data/README.rdoc

@@ -10,11 +10,11 @@ Management Tools for Flare
 
 * flare-stats
  $ flare-stats --index-server=flare1.example.com
-                   hostname  state   role partition balance behind uptime hit version
-   flare1.example.com:12121 active master         0       1      0  12345 100  1.0.10
-   flare2.example.com:12121 active  slave         0       1      0  12345 100  1.0.10
-   flare3.example.com:12121 active master         1       1      0  12345 100  1.0.10
-   flare4.example.com:12121 active  slave         1       1      0  12345 100  1.0.10
+             hostname: port  state   role partition balance    items conn behind hit size uptime version
+   flare1.example.com:12121 active master         0       1    10000  111      0 100   10    12d  1.0.10
+   flare2.example.com:12121 active  slave         0       1    10000  111      0 100   10    12d  1.0.10
+   flare3.example.com:12121 active master         1       1    10001  111      0 100   10    12d  1.0.10
+   flare4.example.com:12121 active  slave         1       1    10001  111      0 100   10    12d  1.0.10
 
 * flare-partition-setting
  $ flare-partition-setting --partition=2

data/Rakefile

@@ -12,10 +12,12 @@ $hoe = Hoe.spec 'flare-tools' do
   self.version = FlareTools::VERSION
   self.developer 'kgws', 'dev.kgws@gmail.com'
   self.post_install_message = 'PostInstall.txt'
-  self.rubyforge_name       = 'kgws'
   self.url = 'http://github.com/kgws/flare-tools'
   self.summary = "Management Tools for Flare"
   self.description = "Flare is a collection of tools for management."
+  self.extra_deps         = [
+    ['net-dns','>= 0.6.1']
+  ]
 end
 
 require 'newgem/tasks'

data/lib/flare/tools.rb

@@ -8,11 +8,13 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'rubygems'
 require 'optparse'
 require 'socket'
 require 'timeout'
+require 'net/dns/resolver'
 require 'tools/core'
 
 module FlareTools
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/lib/flare/tools/cli/stats.rb

@@ -3,7 +3,7 @@
 # Copyright:: Copyright (c) 2010- kgws.
 # License::   This program is licenced under the same licence as kgws.
 #
-# $--- flare-stats-nodes - [ by Ruby ] $
+# $--- flare-stats - [ by Ruby ] $
 # vim: foldmethod=marker tabstop=2 shiftwidth=2
 require 'flare/tools'
 
@@ -15,6 +15,46 @@ class Stats < Core
     self.option_parse
   end
   # }}}
+  # {{{ sort_node
+  def sort_node(nodes)
+    res = {}
+    # sort role
+    res = nodes.sort_by{|key, val| val['role']}
+
+    # sort partition
+    res = nodes.sort_by{|key, val| val['partition']}
+    res
+  end
+  # }}}
+  # {{{ str_date
+  def str_date(date)
+    date = date.to_i
+    res = ""
+    # sec
+    if date >= 60
+      date = date / 60
+    else
+      return "#{date}s"
+    end
+
+    # min
+    if date >= 60
+      date = date / 60
+    else
+      return date + "m"
+    end
+
+    # hour
+    if date >= 24
+      date = date / 24
+    else
+      return date + "h"
+    end
+
+    # day
+    "#{date}d"
+  end
+  # }}}
   # {{{ opt_parse
   def option_parse
     super
@@ -29,16 +69,67 @@ class Stats < Core
   # }}}
   # {{{ execute
   def execute
-    format = "%21s %6s %6s %9s %7s %6s %6s %3s %7s\n"
-    label = format % ["hostname", "state", "role", "partition", "balance", "behind", "uptime", "hit", "version"]
+    format = "%20.20s:%5.5s"   # hostname:port
+    format += " %6s"           # state
+    format += " %6s"           # role
+    format += " %9s"           # partition
+    format += " %7s"           # balance
+    format += " %8.8s"         # items
+    format += " %4s"           # connection
+    format += " %6.6s"         # behind
+    format += " %3.3s"         # hit
+    format += " %4.4s"         # size
+    format += " %6.6s"         # uptime
+    format += " %7s"           # version
+    format += "\n"
+
+    label = format % [
+      "hostname",
+      "port",
+      "state",
+      "role",
+      "partition",
+      "balance",
+      "items",
+      "conn",
+      "behind",
+      "hit",
+      "size",
+      "uptime",
+      "version",
+     ]
     str = ""
     nodes = self.get_stats_nodes
     threads  = self.get_stats_threads
+    nodes = self.sort_node(nodes)
     nodes.each do |hostname_port,data|
-      hostname, port = hostname_port.split(":", 2)
-      stats = self.get_stats(hostname, data['port'])
-      threads[hostname_port]['behind'] = "-" unless threads[hostname_port].key?('behind')
-      str += format % [hostname, data['state'], data['role'], data['partition'], data['balance'], threads[hostname_port]['behind'], stats['uptime'], stats["get_hits"], stats["version"]]
+      ipaddr, port = hostname_port.split(":", 2)
+      if @dns.search(ipaddr).answer[0].methods.include?("ptr")
+        hostname = @dns.search(ipaddr).answer[0].ptr
+      else
+        hostname = ipaddr
+      end
+      stats = self.get_stats(ipaddr, data['port'])
+      partition = data['partition'] == "-1" ? "-" : data['partition']
+      behind = threads[hostname_port].key?('behind') ? threads[hostname_port]['behind'] : "-"
+      uptime = self.str_date(stats['uptime'])
+      hit_rate = stats['cmd_get'] == "0" ?  "-" : (stats['get_hits'].to_f / stats['cmd_get'].to_f * 100.0).round
+      size =  stats['bytes'] == "0" ? "-" : (stats['bytes'].to_i / 1024 / 1024 / 1024)
+      str += format % [
+        hostname,
+        port,
+        data['state'],
+        data['role'],
+        partition,
+        data['balance'],
+        stats['curr_items'],
+        stats['curr_connections'],
+        behind,
+        hit_rate,
+        size,
+        uptime,
+        stats["version"]
+      ]
     end
     puts label + str
   end

data/lib/flare/tools/core.rb

@@ -3,7 +3,7 @@
 # Copyright:: Copyright (c) 2010- kgws.
 # License::   This program is licenced under the same licence as kgws.
 #
-# $--- flare-stats-nodes - [ by Ruby ] $
+# $--- flare-tools - [ by Ruby ] $
 # vim: foldmethod=marker tabstop=2 shiftwidth=2
 
 module FlareTools
@@ -15,6 +15,7 @@ module FlareTools
       @run_flag = true
       @timeout = 10
       @option = OptionParser.new
+      @dns = Net::DNS::Resolver.new
     end
     # }}}
     # {{{ option_parse

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flare-tools
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - kgws
@@ -15,13 +15,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +09:00
+date: 2010-11-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: net-dns
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,11 +49,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :development
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,7 +65,7 @@ dependencies:
         - 2
         version: 2.6.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 description: Flare is a collection of tools for management.
 email: 
 - dev.kgws@gmail.com
@@ -106,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: kgws
+rubyforge_project: flare-tools
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3