city-watch 0.4.6 → 0.4.7

data/lib/city_watch/watchmen/nginx.rb

@@ -12,7 +12,22 @@ class Nginx
 			end
 			acc
 		end
-		out.merge({:num_masters => out[:masters].count, :num_workers => out[:workers].count, :summary => [:num_masters, :num_workers]})
+		
+		require 'net/http'
+		require 'net/https'
+		uri = URI.parse("http://localhost/nginx_status")
+		http = Net::HTTP.new(uri.host, uri.port)
+		req = Net::HTTP::Get.new(uri.path)
+		resp = http.request(req)
+		case resp
+			when Net::HTTPSuccess
+				active, garbage, nums, open = resp.read_body.split("\n")
+				accepts, handled, requests = nums.split
+				garbage, reading, garbage, writing, garbage, waiting = open.split
+				out.merge({:active_connections => active.gsub(/.*:/,''), :accepted => accepts, :handled => handled, :requests => requests, :reading => reading, :writing => writing, :waiting => waiting})
+		end
+		
+		out.merge({:num_masters => out[:masters].count, :num_workers => out[:workers].count, :summary => [:num_masters, :num_workers, :active_connections]})
 	end
 	
 end

data/lib/city_watch/watchmen/unicorns.rb

@@ -3,13 +3,16 @@ class Unicorns
 	include Watchman
 	
 	def self.data
-		out = PS.data.inject({:masters => [], :workers => []}) do |acc,line|
+		out = PS.data.inject({:masters => [], :workers => [], :master_memory => 0, :worker_memory => 0, :total_memory => 0}) do |acc,line|
 			if line[:command][/^start master/]
 				acc[:masters] << line
+				acc[:master_memory] += line[:rss].to_i
 			end
 			if line[:command][/^start worker/]
 				acc[:workers] << line
+				acc[:worker_memory] += line[:rss].to_i
 			end
+			acc[:total_memory] += line[:rss].to_i
 			acc
 		end
 		out.merge({:num_masters => out[:masters].count, :num_workers => out[:workers].count, :summary => [:num_masters, :num_workers]})

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -2,7 +2,7 @@
 name: city-watch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors: 
 - John Bragg