rec 1.1.2 → 1.1.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+=== Version 1.1.3
+- Made dependency on xmpp4r explicit
+
 === Version 1.1.2
 - added mplex.rb to support merging of event streams
 - added MULTIPLEX documentation

data/bin/mplex

@@ -10,6 +10,7 @@ Usage: mplex [OPTION] -i infile [-i infile2...] -o outfile [-o outfile2...]
   where mplex reads from one or more infiles and writes to one or more outfiles.
   --input, -i   the path to a log file to read from
   --output, -o  the path to a log file to write to
+  --name myapp  changes the process name to "myapp", default="mplex"
   --help, -h    display usage
   --version, -v show version
   --debug, -d   display each line on stdout as it is passes through mplex
@@ -27,12 +28,15 @@ options = GetoptLong.new(
   [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
   [ '--version', '-v', GetoptLong::NO_ARGUMENT ],
   [ '--debug', '-d', GetoptLong::NO_ARGUMENT ],
+  [ '--name', '-n', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--input', '-i', GetoptLong::REQUIRED_ARGUMENT ],
   [ '--output', '-o', GetoptLong::REQUIRED_ARGUMENT ]
 )
 
 infilenames = []
 outfilenames = []
+debug = false
+appname = "mplex"
 options.each { |opt, arg|
   case opt
   when "--help"
@@ -47,6 +51,8 @@ options.each { |opt, arg|
     outfilenames << arg
   when "--debug"
     debug = true
+  when "--name"
+    appname = arg
   end
 }
 
@@ -58,13 +64,6 @@ if ARGV.length > 0
   exit 1
 end
 
-# Allow graceful shutdown
-["INT", "TERM", "QUIT"].each { |sig|
-  Signal.trap(sig) {
-    exit(0)
-  }
-}
-
 # Check if the infiles exist and are readable
 failure = false
 infilenames.each { |f|
@@ -91,27 +90,43 @@ outfiles = outfilenames.collect { |path|
   File.new(path, File::APPEND|File::CREAT|File::WRONLY)
 }
 
-# Multiplex the IO streams
-loop {
-  reads = 0
-  infiles.each { |i|
-    line = i.gets().chomp() if i.ready?
-    reads = reads.succ unless line.nil?
-    if line
-      outfiles.each { |o|
-        o.puts(line)
-        o.flush()
-      }
-      puts(line) if debug and not line.nil?
-    end
+# Allow graceful shutdown
+["INT", "TERM", "QUIT"].each { |sig|
+  Signal.trap(sig) {
+    # Close all files
+    infiles.each { |i|
+      i.close unless i.closed?
+    }
+    outfiles.each { |o|
+      o.close unless o.closed?
+    }
+    exit(0)
   }
-  sleep(1) if reads == 0
 }
 
-# Close all files
-infiles.each { |i|
-  i.close unless i.closed?
-}
-outfiles.each { |o|
-  o.close unless o.closed?
-}
+# daemonise the process
+$0 = appname
+fork do
+  Process.setsid
+  exit if fork
+  File.umask 0027 # default mode => 0750
+  STDIN.reopen "/dev/null"
+  STDOUT.reopen "/dev/null"
+  STDERR.reopen "/dev/null"
+  # Multiplex the IO streams
+  loop {
+    reads = 0
+    infiles.each { |i|
+      line = i.gets().chomp() if i.ready?
+      reads = reads.succ unless line.nil?
+      if line
+        outfiles.each { |o|
+          o.puts(line)
+          o.flush()
+        }
+        puts(line) if debug and not line.nil?
+      end
+    }
+    sleep(1) if reads == 0
+  }
+end

data/lib/rec/state.rb

@@ -28,11 +28,24 @@ class State
 		state.release()
 	}
 
-	# shortcut action to generate a message on first event only
+	# shortcut action to generate a message on first event only, swallow the rest
 	Generate_first_only = Proc.new { |state|
-		state.generate_first_only()
+    state.generate(:alert) if @count == 1
 	}
 
+	# shortcut action to notify the admin immediately (eg. system is down)
+	# and wait (eg. for system to come up again)
+	Notify_urgently_first_only = Proc.new { |state|
+    Notify.urgent(state.generate(:alert)) if @count == 1
+  }
+
+	# shortcut action to notify urgently and release
+	# Good for a single event (eg. backup failed) requiring immediate action
+	Notify_urgently_and_release = Proc.new { |state|
+    Notify.urgent(state.generate(:alert))
+		state.release()
+  }
+
 	# A array of Timeouts. A Timeout struct has two elements:
 	# - timestamp at which to expire
 	# - key of the state to be expired

data/rulesets/rules.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/local/bin/ruby
 # run with command like:
 #    rulesets/rules.rb < /var/log/mail.log 3>missed.log 2>control.log > newevents.log
 # takes input from a log file and emits new events to newevents.log
@@ -10,10 +10,10 @@ include REC
 
 # For better security, move the next few lines into a file readable only by the user
 # running this script eg. /home/rec/alert.conf and then require that file
-Notify.smtp_credentials("rec@gmail.com", "recret", "myfirm.com")
-Notify.emailTo = "me@myfirm.com"
-Notify.jabber_credentials("rec@gmail.com", "recret")
-Notify.jabberTo = "me@myfirm.com"
+#Notify.smtp_credentials("rec@gmail.com", "recret", "myfirm.com")
+#Notify.emailTo = "me@myfirm.com"
+#Notify.jabber_credentials("rec@gmail.com", "recret")
+#Notify.jabberTo = "me@myfirm.com"
 
 # load rulesets specified as arguments on the command line
 while ARGV[0]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rec
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Richard Kernahan
@@ -16,8 +16,22 @@ bindir: bin
 cert_chain: []
 
 date: 2012-09-30 00:00:00 Z
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: xmpp4r
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 0
+        - 5
+        version: "0.5"
+  type: :runtime
+  version_requirements: *id001
 description: "\t\tSifts through your log files in real time, using stateful intelligence to determine\n\
   \t\twhat is really important. REC can alert you (by email or IM) or it can simply condense\n\
   \t\ta large log file into a much shorter and more meaningful log.\n\