Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: don't log when rawPacket is empty #2924

Merged
merged 11 commits into from
Aug 25, 2018
Merged

fix: don't log when rawPacket is empty #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
19efd56
fix: don't log when rawPacket is empty
popomore Aug 21, 2018
9ef28fc
f
popomore Aug 21, 2018
eab88c4
f
XadillaX Aug 21, 2018
e865f33
f
popomore Aug 23, 2018
1b152e5
f
popomore Aug 23, 2018
a3a5be0
f
popomore Aug 24, 2018
94e1549
f
popomore Aug 24, 2018
513992a
f
popomore Aug 24, 2018
c7cf25c
f
popomore Aug 24, 2018
da670ca
f
popomore Aug 24, 2018
d437659
Merge branch 'master' into client-error-rawpacket
popomore Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions lib/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,14 @@ class Application extends EggApplication {
}

onClientError(err, socket) {
this.logger.error('A client (%s:%d) error [%s] occurred: %s',
socket.remoteAddress,
socket.remotePort,
err.code,
err.message);
// ignore when there is no http body, it almost like an ECONNRESET
if (err.rawPacket) {
this.logger.warn('A client (%s:%d) error [%s] occurred: %s',
socket.remoteAddress,
socket.remotePort,
err.code,
err.message);
}

if (typeof this.config.onClientError === 'function') {
const p = eggUtils.callFn(this.config.onClientError, [ err, socket, this ]);
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@
"main": "index.js",
"types": "index.d.ts",
"files": [
"index.js",
"lib",
"app",
"config",
"lib",
"index.js",
"index.d.ts"
],
"scripts": {
Expand Down
2 changes: 2 additions & 0 deletions test/fixtures/apps/app-server-customized-client-error/app/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
'use strict';

module.exports = app => {
app.get('/', function* () {
this.body = this.app.serverEmit;
Expand Down
25 changes: 23 additions & 2 deletions test/lib/cluster/app_worker.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
'use strict';

const net = require('net');
const request = require('supertest');
const address = require('address');
const assert = require('assert');
const sleep = require('mz-modules/sleep');
const utils = require('../../utils');

const DEFAULT_BAD_REQUEST_HTML = `<html>
Expand Down Expand Up @@ -64,11 +66,12 @@ describe('test/lib/cluster/app_worker.test.js', () => {

describe('customized client error', () => {
let app;
before(() => {
beforeEach(() => {
app = utils.cluster('apps/app-server-customized-client-error');
app.debug();
return app.ready();
});
after(() => app.close());
afterEach(() => app.close());

it('should do customized request when HTTP request packet broken', async () => {
const version = process.version.split('.').map(a => parseInt(a.replace('v', '')));
Expand All @@ -91,6 +94,13 @@ describe('test/lib/cluster/app_worker.test.js', () => {
test2.request().path = '/foo bar';
await test2.expect(DEFAULT_BAD_REQUEST_HTML).expect(400);
});

it('should not log when there is no rawPacket', async () => {
await connect(app.port);
await sleep(1000);
app.expect('stderr', /HPE_INVALID_EOF_STATE/);
app.notExpect('stderr', /A client/);
});
});

describe('listen hostname', () => {
Expand Down Expand Up @@ -121,3 +131,14 @@ describe('test/lib/cluster/app_worker.test.js', () => {
});
});
});

function connect(port) {
return new Promise(resolve => {
const socket = net.createConnection(port, '127.0.0.1', () => {
socket.write('GET http://127.0.0.1:8080/ HTTP', () => {
socket.destroy();
resolve();
});
});
});
}