jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/398112 )
Change subject: Restore location data to start/complete parse logs
......................................................................
Restore location data to start/complete parse logs
This was an oversight from e7997dd.
Change-Id: I9804f55c9446b911bf12ac3ed0696b725ee0aa80
---
M lib/api/apiUtils.js
M lib/api/routes.js
M lib/parse.js
3 files changed, 11 insertions(+), 14 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
Arlolra: Looks good to me, approved
diff --git a/lib/api/apiUtils.js b/lib/api/apiUtils.js
index 2b855e3..e3dc5bc 100644
--- a/lib/api/apiUtils.js
+++ b/lib/api/apiUtils.js
@@ -2,7 +2,6 @@
require('../../core-upgrade.js');
-var util = require('util');
var semver = require('semver');
var qs = require('querystring');
var cType = require('content-type');
@@ -164,12 +163,6 @@
err.suppressLoggingStack = true;
}
env.log('fatal/request', err);
-};
-
-apiUtils.logTime = function(processLogger, res, str) {
- processLogger.log('info', util.format(
- 'completed %s in %sms', str, Date.now() - res.locals.start
- ));
};
// To support the 'subst' API parameter, we need to prefix each
diff --git a/lib/api/routes.js b/lib/api/routes.js
index d36b083..7fa5a49 100644
--- a/lib/api/routes.js
+++ b/lib/api/routes.js
@@ -313,8 +313,6 @@
}
}
- processLogger.log('info', 'started parsing');
-
var envOptions = Object.assign({
pageBundle: pageBundle,
// Set data-parsoid to be discarded, so that
the subst'ed
@@ -395,7 +393,6 @@
}
metrics.endTiming('wt2html.total',
startTimers.get('wt2html.total'));
}
- apiUtils.logTime(processLogger, res, 'parsing');
});
});
});
@@ -410,8 +407,6 @@
// Performance Timing options
var startTimers = new Map();
-
- processLogger.log('info', 'started serializing');
if (metrics) {
startTimers.set('html2wt.init', Date.now());
@@ -538,7 +533,6 @@
startTimers.get('html2wt.total'));
metrics.timing('html2wt.size.output',
out.wt.length);
}
- apiUtils.logTime(processLogger, res, 'serializing');
apiUtils.plainResponse(res, out.wt, undefined,
apiUtils.wikitextContentType(env));
});
});
diff --git a/lib/parse.js b/lib/parse.js
index 8dd4a6f..b7a2995 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -2,6 +2,8 @@
require('../core-upgrade.js');
+var util = require('util');
+
var ParserEnv = require('./config/MWParserEnvironment.js').MWParserEnvironment;
var ParsoidConfig = require('./config/ParsoidConfig.js').ParsoidConfig;
var TemplateRequest = require('./mw/ApiRequest.js').TemplateRequest;
@@ -135,11 +137,15 @@
}
}
+ var env;
return ParserEnv.getParserEnv(parsoidConfig, obj.envOptions)
- .then(function(env) {
+ .then(function(_env) {
+ env = _env;
+
env.startTime = start;
var s1 = Date.now();
env.bumpTimeUse("Setup Environment", s1 - start);
+ env.log('info', 'started ' + obj.mode);
if (obj.oldid) {
env.page.meta.revision.revid = obj.oldid;
@@ -202,5 +208,9 @@
});
}
})
+ .tap(function() {
+ var end = Date.now() - start;
+ env.log('info', util.format('completed %s in %sms', obj.mode,
end));
+ })
.nodify(cb);
});
--
To view, visit https://gerrit.wikimedia.org/r/398112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9804f55c9446b911bf12ac3ed0696b725ee0aa80
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org>
Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
