post_remote_log 1.6.3 → 1.7.0

data/bin/post-remote-log

@@ -20,14 +20,13 @@ if ARGV.delete("-d")
 end
 
 require 'post_remote_log'
-require 'post_remote_log/simple_xml'
-require 'post_remote_log/methods/xmlrpc'
-require 'post_remote_log/methods/email'
+require 'post_remote_log/methods'
 
 require 'yaml'
 
 OPTIONS = {
-	:config => "/etc/post-remote-log.conf"
+	:config => "/etc/post-remote-log.conf",
+	:verbose => false
 }
 
 ARGV.options do |o|
@@ -44,6 +43,10 @@ ARGV.options do |o|
 	o.on("-d", "Run in background as a daemon. Requires daemon-exec.") do
 		# This option is handled above.
 	end
+	
+	o.on("-v", "Verbose output.") do
+		OPTIONS[:verbose] = true
+	end
 end.parse!
 
 # Load the configuration
@@ -75,16 +78,15 @@ $values = {
 	:report => report
 }
 
-$methods = {
-	:xmlrpc => PostRemoteLog::Methods::XMLRPC,
-	:email => PostRemoteLog::Methods::Email
-}
-
-$config[:methods].values.each do |config|
+$config[:methods].each do |entry|
 	begin
+		name, config = entry
+
+		puts "Evaluating method #{config[:method]}:#{name} which is #{config[:disabled] ? 'disabled' : 'enabled'}..." if OPTIONS[:verbose]
+
 		next if config[:disabled] == true
 
-		method = $methods[config[:method].to_sym]
+		method = PostRemoteLog::Methods.load_method(config[:method])
 
 		method.send(config, $values)
 	rescue => ex

data/lib/post_remote_log/methods.rb

@@ -0,0 +1,18 @@
+
+module PostRemoteLog
+	
+	module Methods
+		@@methods = {}
+		
+		def self.load_method(name)
+			name = name.to_sym
+
+			unless @@methods[name]
+				require File.join(File.dirname(__FILE__), "methods", name.to_s)
+			end
+
+			return @@methods[name]
+		end
+	end
+	
+end

data/lib/post_remote_log/methods/email.rb

@@ -14,12 +14,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'post_remote_log/xml'
+
 require 'net/smtp'
 require 'digest'
 
 module PostRemoteLog
 	module Methods
-
+		
 		class Email
 			def self.send(config, values)
 				message = PostRemoteLog.build_xml_message(values)
@@ -70,8 +71,16 @@ module PostRemoteLog
 				email.puts [values[:report]].pack("m")
 				
 				email.puts "--#{marker}--"
-
-				smtp = Net::SMTP.new(config[:host], config[:port])
+				
+				port = 25
+				
+				if config[:tls]
+					port = 587
+				end
+				
+				port = config[:port] || port
+				
+				smtp = Net::SMTP.new(config[:host], port)
 				
 				begin
 					if config[:tls]
@@ -85,17 +94,22 @@ module PostRemoteLog
 						smtp.enable_starttls(context)
 					end
 					
-					smtp.start(values[:hostname], config[:user], config[:pass], config[:auth])
+					auth = config[:auth] ? config[:auth].to_sym : nil
+					auth ||= :plain if config[:password]
 					
-					smtp.sendmail(email.string, from, [to])
+					smtp.start(values[:hostname], config[:user], config[:password], auth)
 					
-					$stderr.puts "Remote log created successfully."
+					smtp.sendmail(email.string, from, [to])
 				ensure
-					smtp.finish
+					if smtp.started?
+						smtp.finish
+					end
 				end
 			end
 		end
-
+		
+		@@methods[:email] = Email
+		
 	end
 end
 

data/lib/post_remote_log/methods/growl.rb

@@ -0,0 +1,40 @@
+# Copyright (c) 2009 Samuel Williams. Released under the GNU GPLv3.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+require 'ruby-growl'
+
+module PostRemoteLog
+	module Methods
+
+		class Growl
+			def self.send(config, values)
+				g = ::Growl.new(config[:host], "PostRemoteLog", [values[:classification]], [values[:classification]], config[:password])
+				
+				message = StringIO.new
+				[:uptime, :system, :hostname, :address].each do |key|
+					message.puts "[#{key}] #{values[key]}"
+				end
+				
+				message.puts
+				message.puts values[:report]
+				
+				g.notify(values[:classification], "Remote Log [#{values[:classification]}] from #{values[:hostname]}", message.string, config[:priority] || 0, config[:sticky])
+			end
+		end
+
+		@@methods[:growl] = Growl
+
+	end
+end

data/lib/post_remote_log/methods/xmlrpc.rb

@@ -23,8 +23,11 @@ module PostRemoteLog
 			def self.send(config, values)
 				message = PostRemoteLog.build_xml_message(values)
 
-				Net::HTTP.start(config[:host], config[:port]) do |http|
-					response = http.post(config[:path], message.string, {"Content-Type" => "text/xml"})
+				port = config[:port] || 9080
+				path = config[:path] || "/post-remote-log"
+
+				Net::HTTP.start(config[:host], port) do |http|
+					response = http.post(path, message.string, {"Content-Type" => "text/xml"})
 
 					unless (200...300).include?(response.code.to_i)
 						$stderr.puts "Could not create remote log record..."
@@ -32,12 +35,12 @@ module PostRemoteLog
 						$stderr.puts "Code: #{response.code}" 
 						$stderr.puts "Message: #{response.message}"
 						$stderr.puts "Body:\n #{response.body}"
-					else
-						$stderr.puts "Remote log created successfully."
 					end
 				end
 			end
 		end
 
+		@@methods[:xmlrpc] = XMLRPC
+
 	end
 end

data/lib/post_remote_log/version.rb

@@ -16,8 +16,8 @@
 module PostRemoteLog
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 6
-    TINY  = 3
+    MINOR = 7
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/post_remote_log/xml.rb

@@ -13,6 +13,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+require 'post_remote_log/simple_xml'
+
 module PostRemoteLog
 	
 	# Builds an XML formatted message from the supplied values

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 6
-  - 3
-  version: 1.6.3
+  - 7
+  - 0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Samuel Williams
@@ -41,7 +41,9 @@ extra_rdoc_files:
 files: 
 - lib/post_remote_log/extensions.rb
 - lib/post_remote_log/methods/email.rb
+- lib/post_remote_log/methods/growl.rb
 - lib/post_remote_log/methods/xmlrpc.rb
+- lib/post_remote_log/methods.rb
 - lib/post_remote_log/server.rb
 - lib/post_remote_log/simple_xml.rb
 - lib/post_remote_log/version.rb