city-watch 0.7.2 → 0.7.3

data/lib/city_watch/util/watchman.rb

@@ -39,7 +39,7 @@ module Watchman
 		end
 		
 		def opts
-			@options ||= {}
+			@options ||= get_watchman_options
 		end
 		
 		def options(*args)
@@ -63,6 +63,10 @@ module Watchman
 			@post_processors << (block_given? ? block : meth)
 		end
 		
+		def get_watchman_options
+			CityWatch.config[:watchmen] && CityWatch.config[:watchmen][self.name.to_sym] ? CityWatch.config[:watchmen][self.name.to_sym] : {}
+		end
+		
 	end
 	
 	def self.included(base)

data/lib/city_watch/watchmen/redis.rb

@@ -3,6 +3,12 @@ class Redis
 	include Watchman
 	
 	def self.data
+		if opts[:ports]
+			dat = opts[:ports].map do |port|
+				out = `redis-cli -p #{port} info`
+				out.gsub(/^(#.*|$)$/,'').gsub(/(\r\n)+/,"\r\n").split("\r\n").map {|str| str.strip.split(":") }.inject({}) {|acc,(k,v)| acc[k.to_sym] = v; acc }
+			end
+		end
 	end
 	
 end

data/lib/city_watch/watchmen.rb

@@ -10,7 +10,7 @@ module Watchmen
 	
 	def self.data
 		@watchmen.inject({}) do |acc,watchman|
-			if !CityWatch.config[:watchmen] || CityWatch.config[:watchmen].include?(watchman.name)
+			if !CityWatch.config[:watchmen] || CityWatch.config[:watchmen][watchman.name.to_sym]
 				acc[watchman.name] = watchman.data
 			end
 			acc
@@ -41,3 +41,4 @@ require 'city_watch/watchmen/nginx'
 require 'city_watch/watchmen/cpu_usage'
 require 'city_watch/watchmen/disk_usage'
 require 'city_watch/watchmen/uptime'
+require 'city_watch/watchmen/redis'

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: city-watch
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors: