mmtop 0.9.3 → 0.9.4

data/lib/mmtop/commands/kill.rb

@@ -44,13 +44,17 @@ MMTop::Command.register do |c|
 end
 
 MMTop::Command.register do |c|
-  c.regexp %r{^k(:?ill)?\s+l(:?ong)?\s+(\d+)}
-  c.usage "kill long TIME"
-  c.explain "Kill any queries over TIME seconds"
+  c.regexp %r{^k(:?ill)?\s+l(:?ong)?\s+(\d+)\s*(\w*)}
+  c.usage "kill long TIME [SERVER]"
+  c.explain "Kill any queries over TIME seconds on optional server"
   c.command do |cmd, config|
     cmd =~ c.regexp
     time = $3.to_i
-    MMTop::Command.kill_prompt(config.all_processes.select { |p| p.time > time && p.sql =~ /select/i })
+    server = $4.strip
+    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)
   end
 end
 

data/lib/mmtop/process.rb

@@ -19,7 +19,11 @@ module MMTop
     end
 
     def kill!
-      @host.query("KILL #{@real_id}")
+      begin 
+        @host.query("KILL #{@real_id}")
+      rescue Mysql2::Error => e
+        puts e
+      end
     end
 
     def sql

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mmtop
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Ben Osheroff
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-20 00:00:00 +00:00
+date: 2012-01-18 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency