aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: LogAnalyser, ensure error msgs go to stderr not stdout

Browse Source
This commit is contained in:
Kevin Hester 2014-06-25 15:25:29 -07:00 committed by Andrew Tridgell
parent 7dc356f4ca
commit 1a4fce60e8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Tools/LogAnalyzer/DataflashLog.py
View File

@ -4,13 +4,13 @@
# Initial code by Andrew Chapman (amchapman@gmail.com), 16th Jan 2014
#
from __future__ import print_function
import collections
import os
import numpy
import bisect
import sys
class Format:
'''Data channel format as specified by the FMT lines in the log file'''
msgType = 0
@ -332,7 +332,7 @@ class DataflashLog:
else:
errorMsg = "Error parsing line %d of log file: %s" % (lineNumber, self.filename)
if ignoreBadlines:
print errorMsg + " (skipping line)"
print(errorMsg + " (skipping line)", file=sys.stderr)
self.skippedLines += 1
else:
raise Exception("")
@ -372,7 +372,7 @@ class DataflashLog:
if (len(tokens2)-1) != len(self.formats[groupName].labels):
errorMsg = "%s line's value count (%d) not matching FMT specification (%d) on line %d" % (groupName, len(tokens2)-1, len(self.formats[groupName].labels), lineNumber)
if ignoreBadlines:
print errorMsg + " (skipping line)"
print(errorMsg + " (skipping line)", file=sys.stderr)
self.skippedLines += 1
continue
else:
@ -386,6 +386,7 @@ class DataflashLog:
channel.dictData[lineNumber] = value
channel.listData.append((lineNumber,value))
except Exception as e:
print("BAD LINE: " + line, file=sys.stderr)
raise Exception("Error parsing line %d of log file %s - %s" % (lineNumber,self.filename,e.args[0]))