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

move formats one level under the morgan object #238

Closed
wants to merge 1 commit into from
Closed

move formats one level under the morgan object #238

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@ function morgan (format, options) {
}
}

morgan.formats = {}

/**
* Apache combined log format.
*/
Expand All @@ -162,7 +164,7 @@ morgan.format('common', ':remote-addr - :remote-user [:date[clf]] ":method :url
*/

morgan.format('default', ':remote-addr - :remote-user [:date] ":method :url HTTP/:http-version" :status :res[content-length] ":referrer" ":user-agent"')
deprecate.property(morgan, 'default', 'default format: use combined format')
deprecate.property(morgan.formats, 'default', 'default format: use combined format')

/**
* Short format.
Expand Down Expand Up @@ -452,7 +454,7 @@ function createBufferStream (stream, interval) {
*/

function format (name, fmt) {
morgan[name] = fmt
morgan.formats[name] = fmt
return this
}

Expand All @@ -466,7 +468,7 @@ function format (name, fmt) {

function getFormatFunction (name) {
// lookup format
var fmt = morgan[name] || name || morgan.default
var fmt = morgan.formats[name] || name || morgan.formats.default

// return compiled format
return typeof fmt !== 'function'
Expand Down