daemonizer 0.4.8 → 0.4.9

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/daemonizer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{daemonizer}
-  s.version = "0.4.8"
+  s.version = "0.4.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gleb Pomykalov"]

data/lib/daemonizer/cli.rb

@@ -98,11 +98,11 @@ module Daemonizer
       return true    
     end
     
-    desc "stat", "Pools statistics"
-    def stat(pool_name = nil)
-      statistics = Daemonizer::Stats::MemoryStats.new
+    desc "stats", "Pools statistics"
+    def stats(pool_name = nil)
       Daemonizer.find_pools(pool_name).each do |pool|
-        statistics.print(pool.name.to_s)
+        statistics = Daemonizer::Stats::MemoryStats.new(pool)
+        statistics.print
       end
     end
     

data/lib/daemonizer/stats.rb

@@ -132,11 +132,33 @@ module Daemonizer::Stats
   		end
   	end
   	
-  	def print(pool_name)
+  	attr_reader :pool
+  	
+  	def initialize(pool)
+  	  @pool = pool
+	  end
+  	
+  	def find_all_processes
+  	  find_monitor + find_workers
+	  end
+	  
+	  def find_workers
+  	  self.list_processes(:match => /#{@pool.name} worker: instance \d{1,}/)
+    end
+    
+    def find_monitor
+  	  self.list_processes(:match => /#{@pool.name} monitor/)
+    end
+    
+  	def print
   		puts
-  		pool_processes = list_processes(:match =>
-  			/(#{pool_name} worker: instance \d{1,}|#{pool_name} monitor)/)
-  		print_process_list("#{pool_name} processes", pool_processes, :show_ppid => false)
+  		pool_processes = find_all_processes
+  		if pool_processes.size == 0
+  			puts "*** It seems like pool '#{@pool.name}' is not running"
+  			return
+		  end
+		  puts
+  		print_process_list("#{@pool.name} processes", pool_processes, :show_ppid => false)
 
   		if RUBY_PLATFORM !~ /linux/
   			puts
@@ -148,7 +170,7 @@ module Daemonizer::Stats
   				"private dirty RSS of processes cannot be determined."
   		end
   	end
-
+    
   	# Returns a list of Process objects that match the given search criteria.
   	#
   	#  # Search by executable path.
@@ -224,6 +246,7 @@ module Daemonizer::Stats
   	end
 
   private
+  
   	def platform_provides_private_dirty_rss_information?
   		return RUBY_PLATFORM =~ /linux/
   	end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: daemonizer
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 4
-  - 8
-  version: 0.4.8
+  - 9
+  version: 0.4.9
 platform: ruby
 authors: 
 - Gleb Pomykalov