flare-tools 0.1.2 → 0.1.3

data/Rakefile

@@ -16,7 +16,6 @@ $hoe = Hoe.spec 'flare-tools' do
   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
 

data/lib/flare/tools.rb

@@ -8,13 +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 'resolv'
 require 'tools/core'
+require 'tools/logger'
 
 module FlareTools
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

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

@@ -26,7 +26,6 @@ class Stats < Core
     @format += " %7s"           # version
     @format += "\n"
     # }}}
-
     # {{{ @label
     @label = @format % [
       "hostname",
@@ -56,18 +55,8 @@ class Stats < Core
   # }}}
   # {{{ sort_node
   def sort_node(nodes)
-    # sort hostname
-    i = 0
-    nodes = nodes.sort_by{|key, val| [key, i += 1]}
-
-    # sort role
-    i = 0
-    nodes = nodes.sort_by{|key, val| [val['role'], i += 1]}
-
-    # sort partition
-    i = 0
-    nodes = nodes.sort_by{|key, val| [val['partition'], i += 1]}
-    nodes
+    # sort partition role hostname
+    nodes.sort_by{|key, val| [val['partition'], val['role'], key]}
   end
   # }}}
   # {{{ str_date
@@ -107,9 +96,9 @@ class Stats < Core
     threads  = self.get_stats_threads
     nodes.each do |hostname_port,data|
       ipaddr, port = hostname_port.split(":", 2)
-      if @dns.search(ipaddr).answer[0].methods.include?("ptr")
-        hostname = @dns.search(ipaddr).answer[0].ptr
-      else
+      begin
+        hostname = Resolv.getname(ipaddr).to_s
+      rescue Resolv::ResolvError
         hostname = ipaddr
       end
       stats = self.get_stats(ipaddr, data['port'])

data/lib/flare/tools/core.rb

@@ -14,7 +14,7 @@ module FlareTools
       @index_server_port = 12120
       @run_flag = true
       @timeout = 10
-      @dns = Net::DNS::Resolver.new
+      @logger = Logger.new
       @option = OptionParser.new
       self.option_on
       self.option_parse
@@ -42,24 +42,38 @@ module FlareTools
     # {{{ option_param_check
     def option_param_check ; end
     # }}}
-    # {{{ info
-    def info(msg)
-      puts "[INFO] #{msg}"
-    end
-    # }}}
-    # {{{ error
-    def error(msg)
-      puts "\033[31m[ERROR]\033[m #{msg}"
-    end
-    # }}}
-    # {{{ debug
-    def debug(msg)
-      puts "[DEBUG] #{msg}" if $DEBUG
+    # {{{ 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
     # }}}
     # {{{ command
     def command(host, port, cmd, flag=false, t=10)
-      self.debug "Enter the command server. server=[#{host}:#{port}] command=[#{cmd.strip}]"
+      @logger.debug "Enter the command server. server=[#{host}:#{port}] command=[#{cmd.strip}]"
       return true if @run_flag === false && flag === false
       cmd += "\n" unless /\n$/ =~ cmd
       str = ""
@@ -80,10 +94,10 @@ module FlareTools
       end
       str
     rescue Errno::ECONNREFUSED
-      self.error "Connection refused. server=[#{host}:#{port}] command=[#{cmd.strip}]"
+      @logger.error "Connection refused. server=[#{host}:#{port}] command=[#{cmd.strip}]"
       exit 1
     rescue TimeoutError
-      self.error "Connection timeout. server=[#{host}:#{port}] command=[#{cmd.strip}]"
+      @logger.error "Connection timeout. server=[#{host}:#{port}] command=[#{cmd.strip}]"
       exit 1
     end
     # }}}
@@ -117,6 +131,16 @@ module FlareTools
       self.command(@index_server_hostname, @index_server_port, cmd, false, t)
     end
     # }}}
+    # {{{ flush_all
+    def flush_all(hostname, port, t=10)
+      self.command(hostname, port, "flush_all", true, t)
+    end
+    # }}}
+    # {{{ dump
+    def dump(partition, partition_size, wait=0, t=10)
+      self.command(@index_server_hostname, @index_server_port, cmd, false, t)
+    end
+    # }}}
     # {{{ stats_parse
     def stats_parse(str)
       res = {}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flare-tools
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - kgws
@@ -15,29 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +09:00
+date: 2010-12-14 00:00:00 +09:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  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 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +33,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :development
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,7 +49,7 @@ dependencies:
         - 2
         version: 2.6.2
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 description: Flare is a collection of tools for management.
 email: 
 - dev.kgws@gmail.com