city-watch 0.4.7 → 0.4.9

data/lib/city_watch/watchmen/nginx.rb

@@ -13,18 +13,11 @@ class Nginx
 			acc
 		end
 		
-		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})
+		if `curl -I http://localhost/nginx_status`[/^HTTP\/1.1 200/]
+			active, garbage, nums, open = `curl http://localhost/nginx_status`.split("\n")
+			accepts, handled, requests = nums.split
+			garbage, reading, garbage, writing, garbage, waiting = open.split
+			out.merge({:active_connections => active.gsub(/.*:/,'').to_i, :accepted => accepts.to_i, :handled => handled.to_i, :requests => requests.to_i, :reading => reading.to_i, :writing => writing.to_i, :waiting => waiting.to_i})
 		end
 		
 		out.merge({:num_masters => out[:masters].count, :num_workers => out[:workers].count, :summary => [:num_masters, :num_workers, :active_connections]})

data/lib/city_watch/watchmen/unicorns.rb

@@ -7,12 +7,13 @@ class Unicorns
 			if line[:command][/^start master/]
 				acc[:masters] << line
 				acc[:master_memory] += line[:rss].to_i
+				acc[:total_memory] += line[:rss].to_i
 			end
 			if line[:command][/^start worker/]
 				acc[:workers] << line
 				acc[:worker_memory] += line[:rss].to_i
+				acc[:total_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.7"
+  VERSION = "0.4.9"
 end

metadata

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