rec 1.1.5 → 1.2.0

data/CHANGELOG

@@ -1,5 +1,6 @@
-=== Version 1.1.5
-- Several fixes in notify.rb
+=== Version 1.2.0
+- fixed defects in sending mail
+- fixed defect in correlator's time recognition
 
 === Version 1.1.4
 - Made dependency on xmpp4r explicit

data/lib/rec/correlator.rb

@@ -63,7 +63,7 @@ class Correlator
 			logLine.strip!()
 			next if logLine.empty?
 			@@eventsIn += 1
-			@@time, message = parse(logLine)
+			@@now, message = parse(logLine)
 			$stderr.puts("< "+message) if $debug
 			State.expire_states()	# remove expired states before we check the rules
 			eventMatched = false
@@ -105,16 +105,17 @@ class Correlator
 			# Apr 22 16:40:18 aqua Firewall[205]: Skype is listening from 0.0.0.0:51304 proto=6
 			time = Time.local(@year, $1, $2, $3, $4, $5, 0)
 			message = $'
-		elsif logLine =~ /^\[\w+\]\s[Sun|Mon|Tue|Wed|Thu|Fri|Sat]\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+(\d+)\s(\d\d)\:(\d\d)\:(\d\d)\s(\d{4})/
+		elsif logLine =~ /^\[\w+\]\s(Sun|Mon|Tue|Wed|Thu|Fri|Sat)\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+(\d+)\s(\d\d)\:(\d\d)\:(\d\d)\s(\d{4})/
 			# [err] Fri Dec 30 23:58:56 2011 - scan error: 451 SCAN Engine error 2 ...
-			time = Time.local($6, $1, $2, $3, $4, $5, 0)
+			time = Time.local($7, $2, $3, $4, $5, $6, 0)
 			message = $'
-		elseif logLine =~ /^(\d{4})\-(\d\d)\-(\d\d)\s(\d\d)\:(\d\d)\:(\d\d)\.(\d+)\s(\w+)/
+		elsif logLine =~ /^(\d{4})\-(\d\d)\-(\d\d)[\sT](\d\d)\:(\d\d)\:(\d\d)(\S*)\s+/
 			# 2012-04-22 08:43:22.099 EST - Module: PlistFile ...
-			if $7 == "UTC" or $7 == "GMT"
-				time = Time.utc($1, $2, $3, $4, $5, $6, $7)
+			# 2012-10-01T11:45:44+10:00 proc=sendmail status=running
+			if not $7.empty? and ($7.include?("UTC") or $7.include?("GMT"))
+				time = Time.utc($1, $2, $3, $4, $5, $6)
 			else
-				time = Time.local($1, $2, $3, $4, $5, $6, $7)
+				time = Time.local($1, $2, $3, $4, $5, $6)
 			end
 			message = $'
 		else

data/lib/rec/notify.rb

@@ -95,7 +95,11 @@ module Notify
 		smtp = Net::SMTP.new(@@emailServer, @@emailPort)
 		smtp.enable_starttls()
 		smtp.start(@@emailDomain, @@emailUser, @@emailPassword, :plain)
-		smtp.send_message(alert, @@emailUser, recipient)
+		message = []
+		message << "To: #{recipient}\n"
+		message << "Subject: #{subject}\n\n"
+		message << alert
+		smtp.send_message(message, @@emailUser, recipient)
 		smtp.finish()
 	end
 

data/lib/rec/state.rb

@@ -119,7 +119,8 @@ class State
 	# - template is a string like "Server %host$s is down"
 	# - state is the current state
 	def self.find(template, state)
-		title = template.sprinth(state.params)
+		title = template.sprinth(state.details)
+		puts("finding state '#{title}'")
 		@@states[title]
 	end
 
@@ -229,7 +230,7 @@ class State
 	def generate(sym = :alert)
 		message = @params[sym].sprinth(stats())
 		if message.length > 0
-			event = "%s %s" % [@created.iso8601, message] + @logs.join("\n")
+			event = "%s %s" % [@updated.iso8601, message] + @logs.join("\n")
 			print("> ") if $debug
 			puts(event)
 			@@eventsOut = @@eventsOut + 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rec
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
-  - 5
-  version: 1.1.5
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Richard Kernahan