servicemonitor 0.0.13 → 0.0.14

data/lib/Alert/Email.rb

@@ -4,15 +4,20 @@ require "Alert"
 #Email alert class
 #Uses localhost for sending email - Probably need to change this in the future.
 class Alert_Email
-	def initialize( destination, body )
-		@destination = destination
+	def initialize( sender, destination, body )
+		@sender = sender
 		@body = body
+        
+        if destination.is_a? Array then
+            @destination = destination.join( "," )
+        else
+            @destination = destination
+        end
 	end
 
 	def Send
-
 message = <<MESSAGE_END
-From: #{ENV['APP_NAME']} <girvine@lic.co.nz>
+From: #{ENV['APP_NAME']} #{@sender}
 To: #{@destination}
 Subject: #{ENV['APP_NAME']} Alert
 
@@ -21,7 +26,7 @@ Subject: #{ENV['APP_NAME']} Alert
 MESSAGE_END
 
 Net::SMTP.start('localhost') do |smtp|
-  smtp.send_message message, 'girvine@lic.co.nz',
+  smtp.send_message message, @sender,
                              @destination
 end
 

data/lib/MonitorManager.rb

@@ -3,11 +3,11 @@ class MonitorManager
     def initialize
         @list = Array.new
     end
-    
+
     def add( monitor )
         @list.push monitor
     end
-    
+
     #The main run loop
     def run
 		while true do

data/lib/MonitorType.rb

@@ -36,10 +36,10 @@ class MonitorType
                     puts "*** EMAIL_SENDER=<email of sender>"
                     abort
                 else
-                    @admin_email = ENV["EMAIL_SENDER"]
+                    @sender_email = ENV["EMAIL_SENDER"]
                 end
             else
-                @admin_email = params[:admin_email]
+                @sender_email = params[:admin_email]
             end
         end
         
@@ -83,7 +83,7 @@ class MonitorType
         body = "#{@name} tripped.\n#{string}"
         puts "*** "
 		if !@email.nil? then
-			Alert_Email.new( @email, body ).Send
+			Alert_Email.new( @sender_email, @email, body ).Send
             puts "Emailed, #{@email}"
             else
             puts body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servicemonitor
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies: []
 description: Monitor various parts of the system
 email: guy@guyirvine.com