зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1239212 - Append missing newlines to log messages. r=froydnj
--HG-- extra : rebase_source : 35ef04d2c4362d79d1d03d53fc7cce2459ef9437
This commit is contained in:
Родитель
b83566b4a1
Коммит
ad494f87fa
|
@ -149,6 +149,13 @@ public:
|
|||
if (charsWritten == kBuffSize - 1) {
|
||||
// We may have maxed out, allocate a buffer instead.
|
||||
buffToWrite = PR_vsmprintf(aFmt, aArgs);
|
||||
charsWritten = strlen(buffToWrite);
|
||||
}
|
||||
|
||||
// Determine if a newline needs to be appended to the message.
|
||||
const char* newline = "";
|
||||
if (charsWritten == 0 || buffToWrite[charsWritten - 1] != '\n') {
|
||||
newline = "\n";
|
||||
}
|
||||
|
||||
FILE* out = mOutFile ? mOutFile : stderr;
|
||||
|
@ -162,19 +169,19 @@ public:
|
|||
// and the module name.
|
||||
if (!mAddTimestamp) {
|
||||
fprintf_stderr(out,
|
||||
"[%p]: %s/%s %s",
|
||||
"[%p]: %s/%s %s%s",
|
||||
PR_GetCurrentThread(), ToLogStr(aLevel),
|
||||
aName, buffToWrite);
|
||||
aName, buffToWrite, newline);
|
||||
} else {
|
||||
PRExplodedTime now;
|
||||
PR_ExplodeTime(PR_Now(), PR_GMTParameters, &now);
|
||||
fprintf_stderr(
|
||||
out,
|
||||
"%04d-%02d-%02d %02d:%02d:%02d.%06d UTC - [%p]: %s/%s %s",
|
||||
"%04d-%02d-%02d %02d:%02d:%02d.%06d UTC - [%p]: %s/%s %s%s",
|
||||
now.tm_year, now.tm_month + 1, now.tm_mday,
|
||||
now.tm_hour, now.tm_min, now.tm_sec, now.tm_usec,
|
||||
PR_GetCurrentThread(), ToLogStr(aLevel),
|
||||
aName, buffToWrite);
|
||||
aName, buffToWrite, newline);
|
||||
}
|
||||
|
||||
if (buffToWrite != buff) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче