186526/unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify server log format

Browse Source
This commit is contained in:
MICHAEL JACKSON 2017-06-06 15:50:46 -07:00
parent 24662763b1
commit 84075faeed
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
server/index.js
View File

@ -54,11 +54,12 @@ const createServer = (config) => {
app.disable('x-powered-by') app.disable('x-powered-by')
if (process.env.NODE_ENV !== 'production') app.use(morgan(process.env.NODE_ENV === 'production'
app.use(morgan('dev')) // Modified version of the Heroku router's log format
// https://devcenter.heroku.com/articles/http-routing#heroku-router-log-format
if (process.env.LOG_IDS) ? 'method=:method path=":url" host=:req[host] request_id=:req[x-request-id] cf_ray=:req[cf-ray] fwd=:req[x-forwarded-for] status=:status bytes=:res[content-length]'
app.use(morgan('[:date[clf]] :method :url req-id=:req[x-request-id] cf-ray=:req[cf-ray]')) : 'dev'
))
app.use(errorHandler) app.use(errorHandler)
app.use(cors()) app.use(cors())
@ -66,7 +67,7 @@ const createServer = (config) => {
app.get('/', sendHomePage(config.publicDir)) app.get('/', sendHomePage(config.publicDir))
app.use(express.static(config.publicDir, { app.use(express.static(config.publicDir, {
maxAge: config.maxAge maxAge: '365d'
})) }))
app.use(middleware.createRequestHandler(config)) app.use(middleware.createRequestHandler(config))
@ -76,21 +77,19 @@ const createServer = (config) => {
// Heroku dynos automatically timeout after 30s. Set our // Heroku dynos automatically timeout after 30s. Set our
// own timeout here to force sockets to close before that. // own timeout here to force sockets to close before that.
// https://devcenter.heroku.com/articles/request-timeout // https://devcenter.heroku.com/articles/request-timeout
if (config.timeout) { server.setTimeout(25000, (socket) => {
server.setTimeout(config.timeout, (socket) => { const message = `Timeout of 25 seconds exceeded`
const message = `Timeout of ${config.timeout}ms exceeded`
socket.end([ socket.end([
`HTTP/1.1 503 Service Unavailable`, `HTTP/1.1 503 Service Unavailable`,
`Date: ${(new Date).toGMTString()}`, `Date: ${(new Date).toGMTString()}`,
`Content-Type: text/plain`, `Content-Type: text/plain`,
`Content-Length: ${message.length}`, `Content-Length: ${Buffer.byteLength(message)}`,
`Connection: close`, `Connection: close`,
``, ``,
message message
].join(`\r\n`)) ].join(`\r\n`))
}) })
}
return server return server
} }
@ -99,8 +98,6 @@ const defaultServerConfig = {
id: 1, id: 1,
port: parseInt(process.env.PORT, 10) || 5000, port: parseInt(process.env.PORT, 10) || 5000,
publicDir: 'public', publicDir: 'public',
timeout: parseInt(process.env.TIMEOUT, 10) || 20000,
maxAge: process.env.MAX_AGE || '365d',
// for express-unpkg // for express-unpkg
registryURL: process.env.REGISTRY_URL || 'https://registry.npmjs.org', registryURL: process.env.REGISTRY_URL || 'https://registry.npmjs.org',