FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simgear/debug/logstream.cxx: ensure fgfs.log always includes file:line.

Browse Source 
This is a bit of a hack - we set line = -line if m_fileLine is false, so that
the +ve value can be recovered by FileLogCallback::operator().
This commit is contained in:
Julian Smith
2019-12-31 11:50:56 +00:00
parent c5c10a003a
commit 213adb5f0d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
simgear/debug/logstream.cxx
View File

@@ -159,11 +159,13 @@ public:
<< std::left
<< debugClassToString(c)
;
if (file && line != -1) {
if (file) {
/* <line> can be -ve to indicate that m_fileLine was false, but we
want to show file:line information regardless of m_fileLine. */
m_file
<< file
<< ":"
<< line
<< abs(line)
<< ": "
;
}
@@ -200,7 +202,7 @@ public:
if (!shouldLog(c, p)) return;
//fprintf(stderr, "%s\n", aMessage.c_str());
if (file && line != -1) {
if (file && line > 0) {
fprintf(stderr, "%8.2f %s:%i: [%.8s]:%-10s %s\n", logTimer.elapsedMSec()/1000.0, file, line, debugPriorityToString(p), debugClassToString(c), aMessage.c_str());
}
else {
@@ -548,8 +550,8 @@ public:
{
p = translatePriority(p);
if (!m_fileLine) {
/* This prevents output of file:line. */
line = -1;
/* This prevents output of file:line in StderrLogCallback. */
line = -line;
}
LogEntry entry(c, p, fileName, line, msg);
m_entries.push(entry);