diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-03-04 09:53:26 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-03-04 09:53:26 +0000 |
| commit | 3912c73583464e3ff203e3e101325ccabcba0506 (patch) | |
| tree | 3b57620358c4c4cfe1c52702f2979876f6452aa0 /lib/alaveteli_external_command.rb | |
| parent | 2a49615ee3ea08f7952283efc0306a1ac0c23334 (diff) | |
| parent | af83354da1030c2d2fad3c63f3ccb516c4923d38 (diff) | |
Merge branch 'release/0.17' into wdtk
Conflicts:
config/general.yml-example
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) |