Commit 7096cc5c authored by 郝聪敏's avatar 郝聪敏

修改logger输出规则

parent 8f3c6dd9
......@@ -30,7 +30,6 @@ module.exports = function (options) {
const curlDefault = {
followRedirect: false,
json: true,
time: false,
timeout: options.timeout
}
......@@ -44,13 +43,18 @@ module.exports = function (options) {
}
const pipeDefault = {
time: false,
timeout: options.timeout
}
const httpAgent = new Agent(options.agent);
const httpsAgent = new HttpsAgent();
const logger = (option, response) => {
if (options.logger) {
options.logger.info(JSON.stringify({ host: option.uri, ...(response && response.timings)}))
}
}
return async function (ctx, next) {
if (ctx.pipe || ctx.curl) return next()
......@@ -82,6 +86,7 @@ module.exports = function (options) {
resolve(err)
}
} else {
logger(option, response)
resolve(extra.rawRes ? response : {
status: response.statusCode,
headers: response.headers,
......@@ -110,9 +115,7 @@ module.exports = function (options) {
return new Promise(function (resolve, reject) {
let r = ctx.req.pipe(request(option, function (err, response) {
if (option.time && options.logger) {
options.logger.info(option.uri, JSON.stringify(response && response.timings || ''))
}
logger(option, response)
}))
r.on('error', function (err) {
reject(err);
......
{
"name": "request-proxy",
"version": "1.2.1",
"version": "1.2.2",
"description": "",
"main": "index.js",
"scripts": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment