wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1000755 - [about:service] Refine the format of output reports. r=dhylands

Browse Source
This commit is contained in:
Alphan Chen 2014-04-28 14:20:41 +08:00
parent f5ec29e7a8
commit f2a00092ec
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
xpcom/base/nsStatusReporterManager.cpp
View File

@ -64,7 +64,7 @@ nsresult getStatus(nsACString& desc)
if(!gStatusReportProgress)
desc.AssignLiteral("Init");
else {
desc.AssignLiteral("Running:\nThere are ");
desc.AssignLiteral("Running: There are ");
desc.AppendInt(gNumReporters);
desc.AppendLiteral(" reporters");
}
@ -90,19 +90,22 @@ DumpReport(nsIFileOutputStream* aOStream, const nsCString& aProcess,
if (aProcess.IsEmpty()) {
pid = getpid();
nsPrintfCString pidStr("PID %u", pid);
DUMP(aOStream, "\n {\"Process\": \"");
DUMP(aOStream, "\n {\n \"Process\": \"");
DUMP(aOStream, pidStr.get());
} else {
pid = 0;
DUMP(aOStream, "\n {\"Unknown Process\": \"");
DUMP(aOStream, "\n { \"Unknown Process\": \"");
}
DUMP(aOStream, "\", \"Reporter name\": \"");
DUMP(aOStream, "\",\n \"Reporter name\": \"");
DUMP(aOStream, aName.get());
DUMP(aOStream, "\", \"Status Description\": \"");
DUMP(aOStream, aDescription.get());
DUMP(aOStream, "\"}");
DUMP(aOStream, "\",\n \"Status Description\": [\"");
nsCString desc = aDescription;
desc.ReplaceSubstring("|", "\",\"");
DUMP(aOStream, desc.get());
DUMP(aOStream, "\"]\n }");
return NS_OK;
}
@ -168,10 +171,11 @@ nsStatusReporterManager::DumpReports()
//Write the reports to the file
DUMP(ostream, " [Sysdump Report Start]: ");
DUMP(ostream, "{\n\"subject\":\"about:service reports\",\n");
DUMP(ostream, "\"reporters\": [ ");
nsCOMPtr<nsISimpleEnumerator> e;
bool more;
bool more, first = true;
EnumerateReporters(getter_AddRefs(e));
while (NS_SUCCEEDED(e->HasMoreElements(&more)) && more) {
nsCOMPtr<nsISupports> supports;
@ -193,12 +197,17 @@ nsStatusReporterManager::DumpReports()
if (NS_WARN_IF(NS_FAILED(rv)))
return rv;
if (first) {
first = false;
} else {
DUMP(ostream, ",");
}
rv = DumpReport(ostream, process, name, description);
if (NS_WARN_IF(NS_FAILED(rv)))
return rv;
}
DUMP(ostream, "\n [Sysdump Report End] ");
DUMP(ostream, "\n]\n}\n");
rv = ostream->Close();
if (NS_WARN_IF(NS_FAILED(rv)))