mmtop 0.9.9 → 0.9.10

data/bin/mmtop

@@ -11,6 +11,7 @@ spec = <<-EOL
   -p, --password <pass>       The password used to connect to all DBs
   -u, --user <user>           The user used to connect to all DBs
   -o, --ops                   David's funky ops mode
+  -q, --quick                 Display the stats once and exist.
 EOL
 
 args = Getopt::Declare.new(spec)
@@ -23,7 +24,11 @@ while true
   MMTop::PID.reset
   config.get_info
   printer.print_info(config.info)
-  input.control(config)
+  if not config.quick
+    input.control(config)
+  else
+    break
+  end
 end
 
 

data/lib/mmtop/mmconfig.rb

@@ -21,19 +21,24 @@ module MMTop
         Host.new(h['host'], h['user'], h['password'], h)
       end.compact.uniq { |h| h.name }
 
-      @filters = MMTop::Filter.default_filters
       config['sleep'] ||= 5
 
       if config['plugin_dir']
         Dir.glob("#{config['plugin_dir']}/**/*.rb").each { |f| require(f) }
       end
+
+      @filters = MMTop::Filter.default_filters
+
       @options = config
+
+      @quick = cmdline["-q"]
     end
 
     attr_accessor :hosts
     attr_accessor :info
     attr_accessor :filters
     attr_accessor :options
+    attr_accessor :quick
 
     def find_pid(pid)
       ret = info.map { |i|

data/lib/mmtop/term_printer.rb

@@ -48,7 +48,7 @@ module MMTop
     end
 
     def table_header_columns
-      @header_columns ||= ["hostname        ", "pid  ", "time", "#cx", "slave  ", "delay", "qps   ", "comment", Time.now.to_s]
+      @header_columns ||= ["hostname        ", "pid  ", "time", "#cx", "slave  ", "delay", "qps   ", "comment " + info_sep + Time.now.to_s]
     end
 
     def column_fill(index)
@@ -142,13 +142,13 @@ module MMTop
     def print_host(info)
       display_name = info.host.display_name
       display_name = (display_name + "!").red if info.host.dead?
-      str = pipe + " " + column_value(0, display_name + " " + (info.host.comment || ""), "-".dark_gray)
+      str = pipe + " " + column_value(0, display_name + " ", "-".dark_gray)
       str += sep_fill + column_fill(1) + sep_fill + column_fill(2)
       str += info_sep + column_value(3, info.connections.size.to_s)
       str += info_sep + column_value(4, format_slave_status(info.slave_status))
       str += info_sep + column_value(5, format_slave_delay(info.slave_status))
       str += info_sep + column_value(6, info.stats[:qps].to_s)
-      #str += info_sep + column_value(7, info.host.comment || '')
+      str += info_sep + column_value(7, info.host.comment || '')
       str += info_sep
       str += "-".dark_gray * (@x - str.size - 1)
       str += pipe

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mmtop
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -116,7 +116,8 @@ files:
 - lib/mmtop/term_input.rb
 - lib/mmtop/term_printer.rb
 - lib/mmtop.rb
-- bin/mmtop
+- !binary |-
+  YmluL21tdG9w
 homepage: http://github.com/osheroff/mmtop
 licenses: []
 post_install_message: 
@@ -131,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1153904921508667372
+      hash: -870775084710735139
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -140,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1153904921508667372
+      hash: -870775084710735139
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24