diff --git a/src/mad/ruby/OpenNebulaDriver.rb b/src/mad/ruby/OpenNebulaDriver.rb index 94f27a0d3b..fc1251f8d9 100644 --- a/src/mad/ruby/OpenNebulaDriver.rb +++ b/src/mad/ruby/OpenNebulaDriver.rb @@ -103,9 +103,38 @@ class OpenNebulaDriver < ActionManager # be automatically splitted by lines. # ------------------------------------------------------------------------- def log(number, message) + in_error_message=false msg=message.strip msg.each_line {|line| - send_message("LOG", "-", number, line.strip) + severity='I' + + l=line.strip + + if l=='ERROR MESSAGE --8<------' + in_error_message=true + next + elsif l=='ERROR MESSAGE ------>8--' + in_error_message=false + next + else + if in_error_message + severity='E' + elsif line.match(/^(ERROR|DEBUG|INFO):(.*)$/) + line=$2 + case $1 + when 'ERROR' + severity='E' + when 'DEBUG' + severity='D' + when 'INFO' + severity='I' + else + severity='I' + end + end + end + + send_message("LOG", severity, number, line.strip) } end diff --git a/src/mad/sh/scripts_common.sh b/src/mad/sh/scripts_common.sh index 31271085dc..0e5a9781a6 100755 --- a/src/mad/sh/scripts_common.sh +++ b/src/mad/sh/scripts_common.sh @@ -42,16 +42,35 @@ function log_date $DATE +"%a %b %d %T %Y" } -# Logs a message +# Logs a message, alias to log_info function log { - echo "$SCRIPT_NAME: $1" 1>&2 + log_info $1 +} + +# Log function that knows how to deal with severities and adds the +# script name +function log_function +{ + echo "$1: $SCRIPT_NAME: $2" 1>&2 +} + +# Logs an info message +function log_info +{ + log_function "INFO" "$1" } # Logs an error message function log_error { - log "ERROR: $1" + log_function "ERROR" "$1" +} + +# Logs a debug message +function log_debug +{ + log_function "DEBUG" "$1" } # This function is used to pass error message to the mad