diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-01-15 14:29:26 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-03-23 18:24:45 +0000 |
| commit | e7b1cc6d8da1ebf98b5d966ffa67682b24f3a483 (patch) | |
| tree | 396515f1a9812c810b54099a31e37c0f4c07dec6 | |
| parent | fb84ca9d3887325bb0e70fcde6a161f2b8a763ed (diff) | |
Add a default timeout of 20 mins to external commands.
| -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 } ) |