mmtop 0.9.5 → 0.9.6

data/lib/mmtop/filters/map_topology.rb

@@ -1,5 +1,6 @@
 # I'd like to say that I no longer understand this code.
 # Also, I'd like to say that it's unlikely to work for you, the general public.  patches welcome!
+require 'socket'
 
 module MMTop
   class Topology
@@ -28,7 +29,7 @@ module MMTop
       array << host
       t.select { |k, v| 
         # find hosts who are our slaves
-        v[:master] == host[:hostname] 
+        v[:master] == host[:ip] 
       }.sort_by { |k, v| 
         # add those without children of their own first
         v[:is_master].to_i 
@@ -64,31 +65,34 @@ module MMTop
         stack.push(master)
       end
 
-      if last_master
-       host[:final_master] = last_master[:hostname] 
-      else
-       host[:final_master] = host[:hostname]
-      end
       host[:levels] = levels
     end
 
+    def resolve_to_ip(hostname)
+      return nil if hostname.nil?
+      return hostname if hostname =~ /\d+\.\d+\.\d+\.\d+\./
+
+      arr = Socket::gethostbyname(hostname)  
+      arr && arr.last.unpack("CCCC").join(".")
+    end
+
     def find_master_slave
-      topology = @config.hosts.inject({}) { |accum, h|
-        rows = h.query("show global variables where Variable_name='hostname'")
-        next accum if rows.empty?
+      @config.hosts.each { |host|
+        host.ip = resolve_to_ip(host.name) 
+      }
 
-        hostname = rows.first[:Value]
+      topology = @config.hosts.inject({}) { |accum, h|
+        next unless h.ip
 
-        hostname = hostname.split('.')[0]
         status = h.slave_status
 
         if status && status[:Master_User] != 'test'
           master_host = status[:Master_Host]
         end
 
-        master_host = short_name_for_host(master_host) if master_host
+        master_host = resolve_to_ip(master_host)
 
-        accum[hostname] = {:master => master_host, :hostname => hostname}
+        accum[h.ip] = {:master => master_host, :hostname => h.name, :ip => h.ip}
         accum
       }
 
@@ -101,17 +105,6 @@ module MMTop
       }
       topology
     end
-
-    def short_name_for_host(h)
-      if h =~ /\d+.\d+.\d+.\d+/
-        h = ip_to_short_hostname(h)
-      end
-      h.split('.')[0]
-    end
-
-    def ip_to_short_hostname(ip)
-      `grep #{ip} /etc/hosts | awk '{print $2}'`.chomp
-    end
   end
 
   Filter.add_filter("discover_topology") do |queries, hostinfo, config|

data/lib/mmtop/host.rb

@@ -29,7 +29,7 @@ module MMTop
       # rescue connection errors or sumpin
     end
 
-    attr_accessor :display_name, :name, :comment, :options
+    attr_accessor :display_name, :name, :comment, :options, :ip
 
     def query(q)
       return [] if dead?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mmtop
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Ben Osheroff
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-03 00:00:00 +00:00
-default_executable: 
+date: 2012-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mysql2
@@ -70,25 +69,24 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/mmtop/pid.rb
-- lib/mmtop/mmconfig.rb
-- lib/mmtop/filters/basic.rb
-- lib/mmtop/filters/reverse_lookup.rb
-- lib/mmtop/filters/map_topology.rb
-- lib/mmtop/command.rb
+- lib/mmtop.rb
 - lib/mmtop/string_colorize.rb
+- lib/mmtop/commands/basic.rb
+- lib/mmtop/commands/filters.rb
+- lib/mmtop/commands/kill.rb
+- lib/mmtop/filter.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/term_printer.rb
-- lib/mmtop/commands/filters.rb
-- lib/mmtop/commands/kill.rb
-- lib/mmtop/commands/basic.rb
-- lib/mmtop/filter.rb
-- lib/mmtop.rb
+- lib/mmtop/command.rb
+- lib/mmtop/filters/basic.rb
+- lib/mmtop/filters/map_topology.rb
+- lib/mmtop/filters/reverse_lookup.rb
 - bin/mmtop
-has_rdoc: true
 homepage: http://github.com/osheroff/mmtop
 licenses: []
 
@@ -118,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A mytop-ish variant that can watch many mysql servers