diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-03-24 08:36:03 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-24 08:36:03 +0000 |
| commit | f011536d255cfcc7dfa440083f64ac0b2b2eafbe (patch) | |
| tree | 738d6f639628b51701a6f3cb2ac8ec12169a9264 /lib/mail_handler/mail_handler.rb | |
| parent | 2083062c2170915979b83056495f900059e4880a (diff) | |
| parent | 8d4124d610b4703d79a808c6bcd4a856184d12cc (diff) | |
Merge branch '1472-simpler-external-process-management' into rails-3-develop
Diffstat (limited to 'lib/mail_handler/mail_handler.rb')
| -rw-r--r-- | lib/mail_handler/mail_handler.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb index 47015f207..33d939e22 100644 --- a/lib/mail_handler/mail_handler.rb +++ b/lib/mail_handler/mail_handler.rb @@ -78,7 +78,9 @@ module MailHandler tempfile.binmode tempfile.print body tempfile.flush - default_params = { :append_to => text, :binary_output => false } + default_params = { :append_to => text, + :binary_output => false, + :timeout => 1200 } if content_type == 'application/vnd.ms-word' AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt", { :memory_limit => 536870912, :timeout => 120 } ) |