jenkins-bot has submitted this change and it was merged.
Change subject: Tweak error prefixes for ease of browsing in logstash
......................................................................
Tweak error prefixes for ease of browsing in logstash
Change-Id: Ie05504ce341ef07c47a0ce78fc5e123c92f55505
---
M lib/html2wt/DOMDiff.js
M lib/html2wt/LinkHandler.js
M lib/html2wt/WikitextSerializer.js
M lib/html2wt/escapeWikitext.js
4 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Arlolra: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/html2wt/DOMDiff.js b/lib/html2wt/DOMDiff.js
index 78353b1..12e9b1d 100644
--- a/lib/html2wt/DOMDiff.js
+++ b/lib/html2wt/DOMDiff.js
@@ -395,13 +395,13 @@
DU.setDiffMark(node, this.env, change);
} else if (DU.isText(node) || DU.isComment(node)) {
if (change !== 'inserted') {
- this.env.log("error",
+ this.env.log("error/domdiff",
"BUG! CHANGE-marker for " +
node.nodeType + " node is: " + change);
}
meta = DU.prependTypedMeta(node, 'mw:DiffMarker');
} else if (node.nodeType !== node.DOCUMENT_NODE &&
node.nodeType !== node.DOCUMENT_TYPE_NODE) {
- this.env.log("error", "Unhandled node type",
node.nodeType, "in markNode!");
+ this.env.log("error/domdiff", "Unhandled node type",
node.nodeType, "in markNode!");
}
}
if (meta && blockNodeDeleted) {
diff --git a/lib/html2wt/LinkHandler.js b/lib/html2wt/LinkHandler.js
index fa94aaf..e9e027b 100644
--- a/lib/html2wt/LinkHandler.js
+++ b/lib/html2wt/LinkHandler.js
@@ -504,7 +504,7 @@
// If the link target was invalid, instead of emitting
an invalid link,
// omit the link and serialize just the content
instead. But, log the
// invalid html for Parsoid clients to investigate
later.
- state.env.log("error", "Bad title text",
node.outerHTML);
+ state.env.log("error/html2wt/link", "Bad title text",
node.outerHTML);
// For non-piped content, use the original invalid link
text
pipedText = isPiped ? contentSrc : linkTarget;
@@ -648,7 +648,7 @@
var hrefStr;
if (isComplexLink(node.attributes)) {
- env.log("error/html2wt", "Encountered",
+ env.log("error/html2wt/link", "Encountered",
node.outerHTML,
"-- serializing as extlink and dropping
<a> attributes unsupported in wikitext.");
hrefStr = escapeExtLinkURL(getHref(env, node));
@@ -719,7 +719,7 @@
// The only essential thing is the IMG tag!
if (!imgElt) {
- env.log("error",
+ env.log("error/html2wt/figure",
"In WSP.figureHandler, node does not have any img
elements:",
node.outerHTML);
state.emitChunk('', node);
@@ -734,7 +734,7 @@
// (this won't work for manual-thumb images)
var src = imgElt.getAttribute('src');
if (!src) {
- env.log("error",
+ env.log("error/html2wt/figure",
"In WSP.figureHandler, img does not
have resource or src:",
node.outerHTML);
state.emitChunk('', node);
diff --git a/lib/html2wt/WikitextSerializer.js
b/lib/html2wt/WikitextSerializer.js
index 3a4d436..11532bb 100644
--- a/lib/html2wt/WikitextSerializer.js
+++ b/lib/html2wt/WikitextSerializer.js
@@ -685,7 +685,7 @@
} else if (typeof dataMw.body.extsrc === 'string') {
src += dataMw.body.extsrc;
} else {
- state.env.log('error', 'extension src unavailable for:
' + node.outerHTML);
+ state.env.log('error/html2wt/ext', 'Extension src
unavailable for: ' + node.outerHTML);
}
return src + '</' + dataMw.name + '>';
});
diff --git a/lib/html2wt/escapeWikitext.js b/lib/html2wt/escapeWikitext.js
index d9891e7..e0e2560 100644
--- a/lib/html2wt/escapeWikitext.js
+++ b/lib/html2wt/escapeWikitext.js
@@ -586,7 +586,7 @@
return buf;
}
} catch (e) {
- state.env.log("error", "Error escaping text", origText);
+ state.env.log("error/html2wt/wtescape", "Error escaping text",
origText);
}
};
@@ -968,7 +968,7 @@
errors = ["Missing tsr for: " +
JSON.stringify(t)];
errors.push("Arg : " +
JSON.stringify(arg));
errors.push("Toks: " +
JSON.stringify(tokens));
- env.log("error", errors.join("\n"));
+ env.log("error/html2wt/wtescape",
errors.join("\n"));
}
appendStr(arg.substring(da.tsr[0], da.tsr[1]),
last, false);
break;
@@ -978,7 +978,7 @@
errors = ["Missing tsr for: " +
JSON.stringify(t)];
errors.push("Arg : " +
JSON.stringify(arg));
errors.push("Toks: " +
JSON.stringify(tokens));
- env.log("error", errors.join("\n"));
+ env.log("error/html2wt/wtescape",
errors.join("\n"));
}
var tkSrc = arg.substring(da.tsr[0], da.tsr[1]);
// Replace pipe by an entity. This is not
completely safe.
--
To view, visit https://gerrit.wikimedia.org/r/276476
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie05504ce341ef07c47a0ce78fc5e123c92f55505
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Arlolra <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
