Committed by
Gerrit Code Review
Fixed onos-check-error tool.
Change-Id: I1c8b7221aa723bdd4c3c2414f5039668e21cb9e4
Showing
1 changed file
with
13 additions
and
17 deletions
... | @@ -37,39 +37,35 @@ if [ "$2" = "old" ]; then | ... | @@ -37,39 +37,35 @@ if [ "$2" = "old" ]; then |
37 | else | 37 | else |
38 | ssh $remote " | 38 | ssh $remote " |
39 | [ "'`uname`'" != "'"Linux"'" ] && alias tac='tail -r' | 39 | [ "'`uname`'" != "'"Linux"'" ] && alias tac='tail -r' |
40 | - tac $LOG | awk ' | 40 | + tac $LOG | tr -d '\000' | awk ' |
41 | BEGIN { off = 0; fail = 0; } | 41 | BEGIN { off = 0; fail = 0; } |
42 | / org.apache.karaf.main.lock.SimpleFileLock lock/ { | 42 | / org.apache.karaf.main.lock.SimpleFileLock lock/ { |
43 | - off = 1; | ||
44 | exit fail; | 43 | exit fail; |
45 | } | 44 | } |
46 | 45 | ||
47 | / ERROR / { | 46 | / ERROR / { |
48 | - if (!off) { | 47 | + print \$0; |
49 | - print \$0; | 48 | + exc = 0; |
50 | - exc = 0; | 49 | + fail = 1; |
51 | - fail = 1; | ||
52 | - } | ||
53 | } | 50 | } |
54 | / WARN / { | 51 | / WARN / { |
55 | - if (!off && exc) { | 52 | + if (exc) { |
56 | print \$0; | 53 | print \$0; |
57 | exc = 0; | 54 | exc = 0; |
58 | } | 55 | } |
59 | } | 56 | } |
57 | + / INFO / { | ||
58 | + exc = 0; | ||
59 | + } | ||
60 | 60 | ||
61 | /^[a-zA-Z0-9.]*(Exception|Error)/ { | 61 | /^[a-zA-Z0-9.]*(Exception|Error)/ { |
62 | - if (!off) { | 62 | + print \$0; |
63 | - print \$0; | 63 | + exc = 1; |
64 | - exc = 1; | 64 | + fail = 1; |
65 | - fail = 1; | ||
66 | - } | ||
67 | } | 65 | } |
68 | 66 | ||
69 | - / at / { | 67 | + /( at|Caused by:) / { |
70 | - if (!off) { | 68 | + print \$0; |
71 | - print \$0; | ||
72 | - } | ||
73 | } | 69 | } |
74 | END { exit fail; } | 70 | END { exit fail; } |
75 | ' > $aux | 71 | ' > $aux | ... | ... |
-
Please register or login to post a comment