axtro-ar_mailer 2.1.5 → 2.1.6
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/action_mailer/ar_sendmail.rb +2 -2
- data/share/linux/ar_sendmail +3 -3
- metadata +2 -2
@@ -42,7 +42,7 @@ class ActionMailer::ARSendmail
|
|
42
42
|
##
|
43
43
|
# The version of ActionMailer::ARSendmail you are running.
|
44
44
|
|
45
|
-
VERSION = '2.1.
|
45
|
+
VERSION = '2.1.6'
|
46
46
|
|
47
47
|
##
|
48
48
|
# Maximum number of times authentication will be consecutively retried
|
@@ -385,7 +385,7 @@ class ActionMailer::ARSendmail
|
|
385
385
|
[email.id, e.message, e.class, e.backtrace.join("\n\t")]
|
386
386
|
email.destroy
|
387
387
|
session.reset
|
388
|
-
rescue Net::SMTPServerBusy, Net::SMTPUnknownError, Net::SMTPSyntaxError, TimeoutError => e
|
388
|
+
rescue Net::SMTPServerBusy, Net::SMTPUnknownError, Net::SMTPSyntaxError, TimeoutError, Timeout::Error => e
|
389
389
|
email.last_send_attempt = Time.now.to_i
|
390
390
|
email.save rescue nil
|
391
391
|
log "error sending email %d: %p(%s):\n\t%s" %
|
data/share/linux/ar_sendmail
CHANGED
@@ -14,11 +14,11 @@ begin
|
|
14
14
|
config = YAML::load(IO.read(config_file)) || {}
|
15
15
|
if config.empty? || (config.has_key?('defaults') && config.size == 1)
|
16
16
|
puts "No mailers defined. Exiting."
|
17
|
-
exit
|
17
|
+
exit -2
|
18
18
|
end
|
19
19
|
rescue Errno::ENOENT
|
20
20
|
puts "Config file not found at '#{config_file}'!"
|
21
|
-
exit
|
21
|
+
exit -3
|
22
22
|
end
|
23
23
|
|
24
24
|
default_options = {'pidfile' => './log/ar_sendmail.pid'}.merge(config.delete('defaults') || {})
|
@@ -57,7 +57,7 @@ end
|
|
57
57
|
|
58
58
|
def command_error(msg)
|
59
59
|
puts msg
|
60
|
-
exit
|
60
|
+
exit -1
|
61
61
|
end
|
62
62
|
|
63
63
|
if ['start', 'stop', 'restart'].include?(command)
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: axtro-ar_mailer
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 2.1.
|
4
|
+
version: 2.1.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Eric Hodel
|
@@ -10,7 +10,7 @@ autorequire:
|
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
12
|
|
13
|
-
date: 2009-
|
13
|
+
date: 2009-11-11 00:00:00 +01:00
|
14
14
|
default_executable: ar_sendmail
|
15
15
|
dependencies: []
|
16
16
|
|