dohruby 0.3.2 → 0.3.3

data/lib/doh/app/activate_logger.rb

@@ -60,9 +60,9 @@ def self.activate_logger
     acceptor_cfg = logger_cfg['notify_acceptor']
     require 'doh/logger/email_acceptor'
     mail_server = root_cfg['mail_server'] || 'mail.' + get_required_config_value('domain_name', 'mail_server or domain_name required for mail server')
-    from_address = acceptor_cfg['from_address'] || 'notify@' + get_required_config_value('domain_name', 'from_address or domain_name required for notification email address')
+    from_address = root_cfg['smtp_from'] || acceptor_cfg['from_address'] || 'notify@' + get_required_config_value('domain_name', 'from_address or domain_name required for notification email address')
     to_address_list = acceptor_cfg['to_address_list'] || ['root@localhost']
-    notify_acceptor = DohLogger::EmailAcceptor.new(mail_server, from_address, to_address_list, logfile_name, nil, DohLogger::exceptionless_email_format)
+    notify_acceptor = DohLogger::EmailAcceptor.new(mail_server, root_cfg['smtp_port'], from_address, to_address_list, logfile_name, nil, DohLogger::exceptionless_email_format)
     Doh::log.add_acceptor(DohLogger::NOTIFY, notify_acceptor, true, acceptor_cfg['locations_to_exclude'], acceptor_cfg['include_only_locations'])
   end
 
@@ -70,9 +70,9 @@ def self.activate_logger
     acceptor_cfg = logger_cfg['error_acceptor']
     require 'doh/logger/email_acceptor'
     mail_server = root_cfg['mail_server'] || 'mail.' + get_required_config_value('domain_name', 'mail_server or domain_name required for mail server')
-    from_address = acceptor_cfg['from_address'] || 'error@' + get_required_config_value('domain_name', 'from_address or domain_name required for notification email address')
+    from_address = root_cfg['smtp_from'] || acceptor_cfg['from_address'] || 'error@' + get_required_config_value('domain_name', 'from_address or domain_name required for notification email address')
     to_address_list = acceptor_cfg['to_address_list'] || ['root@localhost']
-    error_acceptor = DohLogger::EmailAcceptor.new(mail_server, from_address, to_address_list, logfile_name)
+    error_acceptor = DohLogger::EmailAcceptor.new(mail_server, root_cfg['smtp_port'], from_address, to_address_list, logfile_name)
     Doh::log.add_acceptor(DohLogger::ERROR, error_acceptor, nil, acceptor_cfg['locations_to_exclude'], acceptor_cfg['include_only_locations'])
   end
 end

data/lib/doh/app/options.rb

@@ -16,7 +16,7 @@ class Options
   # set allow_unknown_options to true to allow for filename specification, etc..
   # if the default value is :required for a field, then if that field isn't
   # specified, an exception will be raised
-  def initialize(param_definition_hash_or_array, allow_unknown_options = false, explanation_text = '', unknown_options_name = 'file')
+  def initialize(param_definition_hash_or_array, allow_unknown_options = false, explanation_text = '', unknown_options_name = 'file', allow_no_prefix = false)
     @vals = OpenStruct.new
 
     @opts = OptionParser.new
@@ -37,6 +37,13 @@ class Options
       param_definition_hash = param_definition_hash_or_array
     end
 
+    param_definition_array.each do |elem|
+      keyname = elem.to_a[0][1][2]
+      if keyname =~ /^--no-/
+        raise "key name: #{keyname} will not behave as desired if meant to be a boolean, rename it, or pass in allow_no_prefix flag as 5th param"
+      end
+    end
+
     param_definition_array.each do |elem|
       key = elem.to_a[0][0]
       val = elem.to_a[0][1]

data/lib/doh/logger/email_acceptor.rb

@@ -12,8 +12,9 @@ def self.exceptionless_email_format
 end
 
 class EmailAcceptor
-  def initialize(smtp_server, from_address, to_addresses, logfile_name, subject_format = nil, body_format = DohLogger::exception_email_format)
+  def initialize(smtp_server, smtp_port, from_address, to_addresses, logfile_name, subject_format = nil, body_format = DohLogger::exception_email_format)
     @smtp_server = smtp_server
+    @smtp_port = smtp_port || 25
     @from_address = from_address
     @to_addresses = to_addresses
     @logfile_name = logfile_name

data/lib/doh/util/email.rb

@@ -3,10 +3,11 @@ module DohEmail
 
 @@mail_server = DohApp::config['mail_server'] || 'mail.' + DohApp::get_required_config_value('domain_name', 'mail_server or domain_name required for mail server')
 @@from_address = DohApp::config['from_address'] || 'admin@' + DohApp::get_required_config_value('domain_name', 'from_address or domain_name required for notification email address')
+@@smtp_port = DohApp::config['smtp_port'] || 25
 
 def self.send_email(subject, body, recipients, from_address = @@from_address)
   msg = "Subject:#{subject}\nFrom:#{from_address}\nTo:#{recipients.join(', ')}\nContent-Type: text/plain\n\n#{body}"
-  Net::SMTP.start(@@mail_server) do |smtp|
+  Net::SMTP.start(@@mail_server, @@smtp_port) do |smtp|
     begin
       smtp.send_message(msg, from_address, recipients)
     rescue Exception => excpt

data/test/logger/sample.rb

@@ -5,8 +5,8 @@ scheduler = DohLogger::DirectScheduler.new
 console_acceptor = DohLogger::IOStreamAcceptor.new
 logfile_name = "logger_sample_app.log"
 file_acceptor = DohLogger::IOStreamAcceptor.new(File.new(logfile_name, "wb"))
-error_acceptor = DohLogger::EmailAcceptor.new('localhost', 'from@somebody.com', ['bulbous@gmail.com'], logfile_name)
-notify_acceptor = DohLogger::EmailAcceptor.new('localhost', 'from@somebody.com', ['bulbous@gmail.com'], logfile_name, nil, DohLogger::exceptionless_email_format)
+error_acceptor = DohLogger::EmailAcceptor.new('localhost', 25, 'from@somebody.com', ['bulbous@gmail.com'], logfile_name)
+notify_acceptor = DohLogger::EmailAcceptor.new('localhost', 25, 'from@somebody.com', ['bulbous@gmail.com'], logfile_name, nil, DohLogger::exceptionless_email_format)
 intrfc = DohLogger::StandardInterface.new(scheduler)
 intrfc.add_acceptor(DohLogger::DEBUG, console_acceptor)
 intrfc.add_acceptor(DohLogger::ERROR, error_acceptor)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Makani & Kem Mason
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-16 00:00:00 +12:00
+date: 2010-07-01 00:00:00 +12:00
 default_executable: 
 dependencies: []