shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-23 22:50:09 +03:00
Code Releases Wiki Activity

F #4716: Fix bug in stderr handling (GenericCommand)

Browse Source
This commit is contained in:
Jaime Melis 2016-09-13 16:58:32 +02:00
parent ab9b2e8eed
commit 4c2c698eea
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mad/ruby/CommandManager.rb
View File

@ -43,6 +43,9 @@ require 'timeout'
class GenericCommand
ERROR_OPEN = "ERROR MESSAGE --8<------"
ERROR_CLOSE = "ERROR MESSAGE ------>8--"
attr_reader :code, :stdout, :stderr, :command
# Creates a command and runs it
@ -110,7 +113,10 @@ class GenericCommand
process.call
end
rescue Timeout::Error
log("Timeout executing #{command}")
error_message = "Timeout executing #{command}"
log(error_message)
@stderr = ERROR_OPEN + "\n" + error_message + "\n" + ERROR_CLOSE
3.times {|n| std[n].close if !std[n].closed? }
@ -125,7 +131,7 @@ class GenericCommand
# Parses error message from +stderr+ output
def get_error_message
tmp=@stderr.scan(/^ERROR MESSAGE --8<------\n(.*?)ERROR MESSAGE ------>8--$/m)
tmp=@stderr.scan(/^#{ERROR_OPEN}\n(.*?)#{ERROR_CLOSE}$/m)
return "-" if !tmp[0]
tmp[0].join(' ').strip
end