mmtop 0.9.6 → 0.9.7

data/lib/mmtop/commands/kill.rb

@@ -1,22 +1,52 @@
+require 'ruby-debug'
 module MMTop
   class Command
+    def self.parse_kill_selection(str)
+      strs = str.split(/\s*,\s*/).map(&:strip)
+      strs.map { |s|
+        if not s =~ /^[0-9-\*]+$/
+          $stdout.puts("Invalid query selection, try again")
+          return nil
+        else
+          if s.include?("-")
+            a = s.split("-").map(&:strip)
+            ((a[0].to_i)..(a[1].to_i)).to_a
+          elsif s == "*"
+            s
+          else
+            s.to_i
+          end
+        end
+      }.flatten
+    end
+
     def self.kill_prompt(queries)
       if queries.empty?
         puts "No queries matched."
         return
       end
-  
+
       puts "killing: "
       queries.each_with_index do |q, i|
         puts "#{i}: #{q.host.name}\t\t#{q.sql[0..80]}"
       end
 
-      print "Please confirm (y|n)> "
-      if $stdin.readline != "y\n"
-        puts "no, ok."
+      print "What shall I kill? (ex: 1-4,5,9|*)> "
+
+      line = $stdin.readline
+      if line == "\n"
+        puts "nothing, ok."
       else
-        queries.each(&:kill!)
-        puts "killed."
+        indexes = parse_kill_selection(line)
+        indexes.each { |i|
+          if i == "*"
+            queries.each(&:kill!)
+          elsif queries[i]
+            queries[i].kill!
+          else
+            puts "No such query: #{i}"
+          end
+        }
       end
     end
   end
@@ -51,7 +81,7 @@ MMTop::Command.register do |c|
     cmd =~ c.regexp
     time = $3.to_i
     server = $4.strip
-    list = config.all_processes.select { |p| 
+    list = config.all_processes.select { |p|
       p.time > time && p.sql =~ /select/i && (server.nil? || server.size == 0 || (server == p.host.name))
     }
     MMTop::Command.kill_prompt(list)
@@ -59,15 +89,13 @@ MMTop::Command.register do |c|
 end
 
 
-
-
 MMTop::Command.register do |c|
   c.regexp %r{^k(ill)?\s+(/.*/\w*)}
   c.usage "kill /REGEXP/"
   c.explain "Kill a number of queries by REGEXP"
   c.command do |cmd, config|
     cmd =~ c.regexp
-    r = eval($2) 
+    r = eval($2)
     if !r.is_a?(Regexp)
       puts "Invalid regexp \"#{$1}\""
     else

data/lib/mmtop/filters/map_topology.rb

@@ -18,7 +18,7 @@ module MMTop
       hosts.each { |h|
         top = new_top.find { |t| t[:hostname] == h.name }
         next unless top
-        if top[:levels] > 0 
+        if top[:levels] > 0
           h.display_name = ("  " * top[:levels]) + '\_' + h.name
         end
       }
@@ -27,13 +27,13 @@ module MMTop
 
     def insert_host_into_sort_array(t, host, array)
       array << host
-      t.select { |k, v| 
+      t.select { |k, v|
         # find hosts who are our slaves
-        v[:master] == host[:ip] 
-      }.sort_by { |k, v| 
+        v[:master] == host[:ip]
+      }.sort_by { |k, v|
         # add those without children of their own first
-        v[:is_master].to_i 
-      }.each { |k, s| 
+        v[:is_master].to_i
+      }.each { |k, s|
         insert_host_into_sort_array(t, s, array)
       }
       array
@@ -43,8 +43,8 @@ module MMTop
     def create_sort_array(t)
       array = []
       t.values.select { |v|
-        v[:levels] == 0 
-      }.sort_by { |v| 
+        v[:levels] == 0
+      }.sort_by { |v|
         v[:hostname]
       }.each { |v|
         insert_host_into_sort_array(t, v, array)
@@ -60,7 +60,7 @@ module MMTop
         # loop detection
         break if stack.include?(master)
 
-        last_master = master 
+        last_master = master
         levels += 1
         stack.push(master)
       end
@@ -72,13 +72,13 @@ module MMTop
       return nil if hostname.nil?
       return hostname if hostname =~ /\d+\.\d+\.\d+\.\d+\./
 
-      arr = Socket::gethostbyname(hostname)  
+      arr = Socket::gethostbyname(hostname)
       arr && arr.last.unpack("CCCC").join(".")
     end
 
     def find_master_slave
       @config.hosts.each { |host|
-        host.ip = resolve_to_ip(host.name) 
+        host.ip = resolve_to_ip(host.name)
       }
 
       topology = @config.hosts.inject({}) { |accum, h|
@@ -101,7 +101,7 @@ module MMTop
         master_top = topology[v[:master]]
         if master_top
           master_top[:is_master] = 1
-        end 
+        end
       }
       topology
     end

data/lib/mmtop/host.rb

@@ -22,7 +22,9 @@ module MMTop
         if e.error_number == 2003
           mark_dead!
         else
-          raise e
+          $stdout.puts("Got Error Number #{e.error_number} (#{e.inspect}) trying to connect to #{@name}")
+          mark_dead!
+          sleep(1)
         end
       end
 

data/lib/mmtop/mmconfig.rb

@@ -19,7 +19,7 @@ module MMTop
         h['wedge_monitor'] ||= config['wedge_monitor']
 
         Host.new(h['host'], h['user'], h['password'], h)
-      end.compact
+      end.compact.uniq { |h| h.name } 
 
       @filters = MMTop::Filter.default_filters
       config['sleep'] ||= 5

data/lib/mmtop/process.rb

@@ -5,7 +5,7 @@ module MMTop
       @query = result[:Info]
       @status = result[:State]
       @time = result[:Time]
-      @client, @client_port = result[:Host] && result[:Host].split(":") 
+      @client, @client_port = result[:Host] && result[:Host].split(":")
       @client ||= "(slave)"
       @client_port ||= ""
       @db = result[:db]
@@ -19,7 +19,7 @@ module MMTop
     end
 
     def kill!
-      begin 
+      begin
         @host.query("KILL #{@real_id}")
       rescue Mysql2::Error => e
         puts e

data/lib/mmtop/qps.rb

@@ -7,7 +7,7 @@ module MMTop
     def self.window
       @window || DEFAULT_WINDOW
     end
-  
+
     def self.window=(window)
       @window = window
     end
@@ -27,7 +27,7 @@ module MMTop
 
       queries = samples.last[QUERIES] - samples.first[QUERIES]
       time = samples.last[TIME].to_i - samples.first[TIME].to_i
-    
+
       queries / time
     end
 

data/lib/mmtop/term_input.rb

@@ -1,5 +1,5 @@
 require 'timeout'
-require 'readline' 
+require 'readline'
 
 module MMTop
   class TermInput
@@ -23,7 +23,7 @@ module MMTop
       while true
         cmdline = Readline::readline('> ')
         exit if cmdline.nil?
-        Readline::HISTORY.push(cmdline) 
+        Readline::HISTORY.push(cmdline)
         return if cmdline.empty?
         c = find_command(cmdline)
         if c.nil?

data/lib/mmtop/term_printer.rb

@@ -58,7 +58,7 @@ module MMTop
     def sep_fill
       fill * sep.size
     end
-  
+
     def column_value_with_fill(index, str, fill, align)
       fill_str = fill * (table_header_columns[index].size - str.size)
       if align == :left
@@ -115,13 +115,13 @@ module MMTop
     def format_process(process, sz)
       query = process.sql ? process.sql[0..sz-2] : ''
       case process.time
-        when 0..2:
+        when 0..2
           query
-        when 2..10:
+        when 2..10
           query.white.bold
         else
           query.red
-      end 
+      end
     end
 
     def clear_screen
@@ -163,11 +163,11 @@ module MMTop
         table_header_columns[-1] = ''
       end
 
-      str = pipe + " " + table_header_columns.join(sep) 
+      str = pipe + " " + table_header_columns.join(sep)
       fill_len = (@x - str.size) - 1
-     
+
       print str
-      print ' ' * fill_len if fill_len > 0 
+      print ' ' * fill_len if fill_len > 0
       puts pipe
     end
 

metadata

@@ -1,124 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mmtop
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.9.7
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 6
-  version: 0.9.6
 platform: ruby
-authors: 
+authors:
 - Ben Osheroff
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mysql2
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: getopt-declare
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: getopt-declare
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yaggy
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - ben@gimbo.net
-executables: 
+executables:
 - mmtop
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/mmtop.rb
-- lib/mmtop/string_colorize.rb
+files:
+- lib/mmtop/command.rb
 - lib/mmtop/commands/basic.rb
 - lib/mmtop/commands/filters.rb
 - lib/mmtop/commands/kill.rb
 - lib/mmtop/filter.rb
+- lib/mmtop/filters/basic.rb
+- lib/mmtop/filters/map_topology.rb
+- lib/mmtop/filters/reverse_lookup.rb
+- lib/mmtop/host.rb
+- lib/mmtop/mmconfig.rb
 - lib/mmtop/pid.rb
 - lib/mmtop/process.rb
-- lib/mmtop/host.rb
-- lib/mmtop/term_input.rb
 - lib/mmtop/qps.rb
-- lib/mmtop/mmconfig.rb
+- lib/mmtop/string_colorize.rb
+- lib/mmtop/term_input.rb
 - lib/mmtop/term_printer.rb
-- lib/mmtop/command.rb
-- lib/mmtop/filters/basic.rb
-- lib/mmtop/filters/map_topology.rb
-- lib/mmtop/filters/reverse_lookup.rb
-- bin/mmtop
+- lib/mmtop.rb
+- !binary |-
+  YmluL21tdG9w
 homepage: http://github.com/osheroff/mmtop
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3103276699408599022
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 3103276699408599022
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A mytop-ish variant that can watch many mysql servers
 test_files: []
-