Skip to content

Commit

Permalink
Merge 0c0e398 into c68d2ea
Browse files Browse the repository at this point in the history
  • Loading branch information
ryhinchey committed Apr 10, 2020
2 parents c68d2ea + 0c0e398 commit a963a9b
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions index.js
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

0 comments on commit a963a9b

Please sign in to comment.