city-watch 0.5.7 → 0.5.8

data/lib/city_watch/util/alerts.rb

@@ -20,7 +20,7 @@ module Alerts
 		CityWatch.redis.zrevrange "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::alerts", 0, num - 1
 	end
 
-	def send_alerts!
+	def send_alerts!(*args)
 		get_alerts.map do |alert|
 			puts "Alert: #{alert.inspect}" if CityWatch.debug?
 		end

data/lib/city_watch/util/datasets.rb

@@ -5,7 +5,7 @@ module DataSets
 		@datasets[name] = block
 	end
 	
-	def run_dataset_collector(dat)
+	def run_dataset_collector(dat,rcv=nil,host=nil)
 		@datasets.map do |(name,dataset)|
 			dataset.call(dat)
 		end if @datasets

data/lib/city_watch/util/rules.rb

@@ -5,7 +5,7 @@ module Rules
 		@rules[name] = block
 	end
 	
-	def run_rules(dat)
+	def run_rules(dat,rcv=nil,host=nil)
 		@rules.map do |(name,rule)|
 			rule.call(dat)
 		end if @rules

data/lib/city_watch/util/watchman.rb

@@ -21,9 +21,7 @@ module Watchman
 				sum = dat[:summary].is_a?(Array) ? dat[:summary].inject({}) {|acc,k| acc[k.to_sym] = dat[k.to_sym]; acc} : dat[:summary]
 				CityWatch.redis.zadd "#{CityWatch.config[:prefix]}::#{host}::#{self.name}::summary", rcv_time, Yajl::Encoder.encode(sum)
 			end
-			run_rules(dat)
-			run_dataset_collector(dat)
-			send_alerts!
+			run_post_processors!(dat,rcv,host)
 			return 0, sum || nil
 		end
 		
@@ -53,16 +51,30 @@ module Watchman
 		end
 		alias_method :option, :options
 		
+		def run_post_processors!(dat,rcv,host)
+			@post_processors.each do |proc|
+				proc.call(dat,rcv,host)
+			end if @post_processors
+		end
+		
+		def add_post_processor(meth=nil,&block)
+			@post_processors ||= []
+			@post_processors << (block_given? ? block : meth)
+		end
+		
 	end
 	
 	def self.included(base)
+		base.extend(ClassMethods)
 		base.extend(Alerts)
+		base.add_post_processor base.method(:send_alerts!)
 		base.extend(Rules)
+		base.add_post_processor base.method(:run_rules)
 		base.extend(Flags)
 		base.extend(Notifications)
 		base.extend(DataSets)
+		base.add_post_processor base.method(:run_dataset_collector)
 		base.extend(Status)
-		base.extend(ClassMethods)
 		Watchmen.register(base)
 	end
 	

data/lib/city_watch/watchmen/uptime.rb

@@ -17,4 +17,8 @@ class Uptime
 		out.merge({:summary => [:uptime_days]})
 	end
 	
+	add_rule(:status_vars) do |data|
+		set_status_var :uptime, data[:uptime_days]
+	end 
+	
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CityWatch
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
 end

metadata

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