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

update to latest fastify and all plugin to latest release; configure… #17

Merged
merged 5 commits into from
Nov 22, 2018
Merged

update to latest fastify and all plugin to latest release; configure… #17

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c695a2
update to latest fastify and all plugin to latest release; configure…
sandromartiniYnap Nov 15, 2018
9897cd7
update tests to use the (err, address) function in listen, to simplif…
sandromartiniYnap Nov 16, 2018
9beef4e
update requirements to fastify 1.1.0 or later, like in fastify-plugin…
sandromartiniYnap Nov 16, 2018
550b176
remove template strings where not really needed
sandromartiniYnap Nov 16, 2018
b954363
update README with Fastify minimum release required
smartiniOnGitHub Nov 19, 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
6 changes: 3 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ function underPressure (fastify, opts, next) {
type: 'object',
properties: {
status: { type: 'string' }
}}
}
}
} }
},
handler: onStatus
})
Expand Down Expand Up @@ -110,6 +110,6 @@ function now () {
}

module.exports = fp(underPressure, {
fastify: '>=0.39.0',
fastify: '^1.1.0',
name: 'under-pressure'
})
14 changes: 7 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"main": "index.js",
"scripts": {
"lint": "standard | snazzy",
"unit": "tap test.js",
"unit": "tap -J test.js",
"test": "npm run lint && npm run unit",
"coverage": "npm run unit -- --cov --coverage-report=html"
},
Expand All @@ -26,14 +26,14 @@
"author": "Tomas Della Vedova - @delvedor (http://delved.org)",
"license": "MIT",
"dependencies": {
"fastify-plugin": "^1.2.0"
"fastify-plugin": "^1.2.1"
},
"devDependencies": {
"fastify": "^1.7.0",
"fastify": "^1.13.0",
"pre-commit": "^1.2.2",
"simple-get": "^3.0.2",
"snazzy": "^7.1.1",
"standard": "^11.0.1",
"tap": "^12.0.1"
"simple-get": "^3.0.3",
"snazzy": "^8.0.0",
"standard": "^12.0.1",
"tap": "^12.1.0"
}
}
35 changes: 21 additions & 14 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,15 @@ test('Should return 503 on maxEventLoopDelay', t => {
reply.send({ hello: 'world' })
})

fastify.listen(0, err => {
fastify.listen(0, (err, address) => {
t.error(err)
fastify.server.unref()

// Increased to prevent Travis to fail
process.nextTick(() => sleep(1000))
sget({
method: 'GET',
url: 'http://localhost:' + fastify.server.address().port
url: `${address}`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can use just address, there is no need to use a template string :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@delvedor removed template strings where not really needed ... thanks for the feedback

}, (err, response, body) => {
t.error(err)
t.strictEqual(response.statusCode, 503)
Expand All @@ -52,13 +53,14 @@ test('Should return 503 on maxHeapUsedBytes', t => {
reply.send({ hello: 'world' })
})

fastify.listen(0, err => {
fastify.listen(0, (err, address) => {
t.error(err)
fastify.server.unref()

process.nextTick(() => sleep(500))
sget({
method: 'GET',
url: 'http://localhost:' + fastify.server.address().port
url: `${address}`
}, (err, response, body) => {
t.error(err)
t.strictEqual(response.statusCode, 503)
Expand All @@ -85,13 +87,14 @@ test('Should return 503 on maxRssBytes', t => {
reply.send({ hello: 'world' })
})

fastify.listen(0, err => {
fastify.listen(0, (err, address) => {
t.error(err)
fastify.server.unref()

process.nextTick(() => sleep(500))
sget({
method: 'GET',
url: 'http://localhost:' + fastify.server.address().port
url: `${address}`
}, (err, response, body) => {
t.error(err)
t.strictEqual(response.statusCode, 503)
Expand Down Expand Up @@ -120,13 +123,14 @@ test('Custom message and retry after header', t => {
reply.send({ hello: 'world' })
})

fastify.listen(0, err => {
fastify.listen(0, (err, address) => {
t.error(err)
fastify.server.unref()

process.nextTick(() => sleep(500))
sget({
method: 'GET',
url: 'http://localhost:' + fastify.server.address().port
url: `${address}`
}, (err, response, body) => {
t.error(err)
t.strictEqual(response.statusCode, 503)
Expand Down Expand Up @@ -158,14 +162,15 @@ test('memoryUsage name space', t => {
reply.send({ hello: 'world' })
})

fastify.listen(0, err => {
fastify.listen(0, (err, address) => {
t.error(err)
t.is(typeof fastify.memoryUsage, 'function')
fastify.server.unref()

process.nextTick(() => sleep(500))
sget({
method: 'GET',
url: 'http://localhost:' + fastify.server.address().port
url: `${address}`
}, (err, response, body) => {
t.error(err)
t.strictEqual(response.statusCode, 200)
Expand All @@ -188,14 +193,15 @@ test('memoryUsage name space (without check)', t => {
reply.send({ hello: 'world' })
})

fastify.listen(0, err => {
fastify.listen(0, (err, address) => {
t.error(err)
t.is(typeof fastify.memoryUsage, 'function')
fastify.server.unref()

process.nextTick(() => sleep(500))
sget({
method: 'GET',
url: 'http://localhost:' + fastify.server.address().port
url: `${address}`
}, (err, response, body) => {
t.error(err)
t.strictEqual(response.statusCode, 200)
Expand All @@ -213,13 +219,14 @@ test('Expose status route', t => {
exposeStatusRoute: true
})

fastify.listen(0, err => {
fastify.listen(0, (err, address) => {
t.error(err)
fastify.server.unref()

process.nextTick(() => sleep(500))
sget({
method: 'GET',
url: 'http://localhost:' + fastify.server.address().port + '/status'
url: `${address}/status`
}, (err, response, body) => {
t.error(err)
t.strictEqual(response.statusCode, 200)
Expand Down