Allow app to start w/o ERRBIT_EMAIL_FROM

Brian DeHamer
1 parent c8ad80d3
Showing 1 changed file with 2 additions and 1 deletions Show diff stats
config/initializers/_load_config.rb
@@ -34,7 +34,8 @@ unless defined?(Errbit::Config)
       :authentication => :plain,
       :user_name      => ENV['SMTP_USERNAME']   || ENV['SENDGRID_USERNAME'],
       :password       => ENV['SMTP_PASSWORD']   || ENV['SENDGRID_PASSWORD'],
-      :domain         => ENV['SMTP_DOMAIN'] || ENV['SENDGRID_DOMAIN'] || ENV['ERRBIT_EMAIL_FROM'].split('@').last
+      :domain         => ENV['SMTP_DOMAIN'] || ENV['SENDGRID_DOMAIN'] ||
+                           (ENV['ERRBIT_EMAIL_FROM'] ? ENV['ERRBIT_EMAIL_FROM'].split('@').last : nil)
     }
   end
...	...	@@ -34,7 +34,8 @@ unless defined?(Errbit::Config)
34	34	:authentication => :plain,
35	35	:user_name => ENV['SMTP_USERNAME'] \|\| ENV['SENDGRID_USERNAME'],
36	36	:password => ENV['SMTP_PASSWORD'] \|\| ENV['SENDGRID_PASSWORD'],
37		- :domain => ENV['SMTP_DOMAIN'] \|\| ENV['SENDGRID_DOMAIN'] \|\| ENV['ERRBIT_EMAIL_FROM'].split('@').last
	37	+ :domain => ENV['SMTP_DOMAIN'] \|\| ENV['SENDGRID_DOMAIN'] \|\|
	38	+ (ENV['ERRBIT_EMAIL_FROM'] ? ENV['ERRBIT_EMAIL_FROM'].split('@').last : nil)
38	39	}
39	40	end
40	41
...	...