diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-23 14:46:33 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-23 14:46:33 +0000 |
| commit | 3041e9b8286fbdd23467b70efd4318c32abb48a2 (patch) | |
| tree | e472d5c7d640ba6805fe06d8024b5211b19507cc /lib/alaveteli_external_command.rb | |
| parent | 09a7180b3f5ddbed54da23a6985fff196cc36af2 (diff) | |
| parent | 75900830370801d51743a61f0c1e4793f2f91b4f (diff) | |
Merge branch 'trap-abnormal-exits' into rails-3-develop
Diffstat (limited to 'lib/alaveteli_external_command.rb')
| -rw-r--r-- | lib/alaveteli_external_command.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/alaveteli_external_command.rb b/lib/alaveteli_external_command.rb index fbdee8a62..086a461c8 100644 --- a/lib/alaveteli_external_command.rb +++ b/lib/alaveteli_external_command.rb @@ -44,7 +44,11 @@ module AlaveteliExternalCommand end xc.run(opts[:stdin_string] || "", opts[:env] || {}) - if xc.status != 0 + if !xc.exited + # Crash or timeout + $stderr.puts("#{program_name} #{args.join(' ')}:exited abnormally") + return nil + elsif xc.status != 0 # Error $stderr.puts("Error from #{program_name} #{args.join(' ')}:") $stderr.print(xc.err) |