From: dibs Date: Fri, 29 Mar 2013 07:28:46 +0000 (+0900) Subject: [title] Fixed parsing about log X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f4fdf106bf8769ec35699a79deae72713a85806;p=sdk%2Ftools%2Fsdk-build.git [title] Fixed parsing about log --- diff --git a/src/build_server/JobLog.rb b/src/build_server/JobLog.rb index 488c4d1..c32064a 100644 --- a/src/build_server/JobLog.rb +++ b/src/build_server/JobLog.rb @@ -49,13 +49,26 @@ class JobLog < Log def JobLog.parse_log(line) - line = line.sub(/^[a-zA-Z], \[.*\][ \t]*/,"") - linetok = line.split(" -- : ") - if linetok.count != 2 then return "INFO", 1, "" end - category = linetok[0] - line = linetok[1] - level = line[1..1].to_i - contents = line[4..-1] + data = line.sub(/(^[a-zA-Z], \[[^\]]*\][ \t]*)/,"") + if $1.nil? then + return "UNKNOWN", 1, line + end + + data_tok = data.split(" -- : ") + if data_tok.nil? then + return "UNKNOWN", 1, line + elsif data_tok.count != 2 then + return "INFO", 1, "" + end + + category = data_tok[0] + sub_data = data_tok[1] + level = sub_data[1..1].to_i + contents = sub_data[4..-1] + + if contents.nil? then + contents = "" + end return category, level, contents end