Add 'http' loglevel, by default

endeep · Dec 8, 2011 · 4e5130b · 4e5130b
1 parent 759c1fa
commit 4e5130b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 26 deletions.
diff --git a/doc/cli/config.md b/doc/cli/config.md
@@ -387,13 +387,16 @@ The location to write log output.
 
 ### loglevel
 
-* Default: "warn"
+* Default: "http"
 * Type: String
-* Values: "silent", "win", "error", "warn", "info", "verbose", "silly"
+* Values: "silent", "win", "error", "warn", "http", "info", "verbose", "silly"
 
 What level of logs to report.  On failure, *all* logs are written to
 `npm-debug.log` in the current working directory.
 
+Any logs of a higher level than the setting are shown.
+The default is "http", which shows http, warn, and error output.
+
 ### logprefix
 
 * Default: true on Posix, false on Windows

diff --git a/lib/utils/config-defs.js b/lib/utils/config-defs.js
@@ -160,7 +160,7 @@ Object.defineProperty(exports, "defaults", {get: function () {
     , "init.author.url" : ""
     , link: false
     , logfd : 2
-    , loglevel : "warn"
+    , loglevel : "http"
     , logprefix : process.platform !== "win32" || winColor
     , long : false
     , message : "%s"
@@ -236,7 +236,7 @@ exports.types =
   , "init.author.url" : ["", url]
   , link: Boolean
   , logfd : [Number, Stream]
-  , loglevel : ["silent","win","error","warn","info","verbose","silly"]
+  , loglevel : ["silent","win","error","warn","http","info","verbose","silly"]
   , logprefix : Boolean
   , long : Boolean
   , message: String

diff --git a/lib/utils/fetch.js b/lib/utils/fetch.js
@@ -16,7 +16,6 @@ module.exports = fetch
 
 function fetch (remote, local, headers, cb) {
   if (typeof cb !== "function") cb = headers, headers = {}
-  log.info(remote, "fetch")
   log.verbose(local, "fetch to")
   mkdir(path.dirname(local), function (er) {
     if (er) return cb(er)
@@ -42,6 +41,7 @@ function fetch_ (remote, local, headers, cb) {
 
 function makeRequest (remote, fstr, headers) {
   remote = url.parse(remote)
+  log.http(remote.pathname, "GET")
   regHost = regHost || url.parse(npm.config.get("registry")).host
 
   if (remote.host === regHost && npm.config.get("always-auth")) {
@@ -58,5 +58,10 @@ function makeRequest (remote, fstr, headers) {
   request({ url: remote
           , proxy: proxy
           , agent: getAgent(remote)
-          , strictSSL: npm.config.get("strict-ssl") }).pipe(fstr)
+          , strictSSL: npm.config.get("strict-ssl")
+          , onResponse: onResponse }).pipe(fstr)
+  function onResponse (er, res) {
+    if (er) return cb(er)
+    log.http(res.statusCode + " " + remote.pathname)
+  }
 }
diff --git a/lib/utils/log.js b/lib/utils/log.js
@@ -1,21 +1,4 @@
 
-/*
-log levels:
-0,1,2,3
-verbose,info,warn,error
-
-Default setting for logs is "info"
-Default setting to show is "info"
-
-Possible values of level/loglevel:
-silly,verbose,info,warn,error,win,silent
-
-silent quiets everything
-
-
-*/
-
-
 module.exports = log
 
 var output = require("./output.js")
@@ -28,6 +11,7 @@ var l = -1
   , LEVEL = { silly   : l++
             , verbose : l++
             , info    : l++
+            , "http"  : l++
             , WARN    : l++
             , "ERR!"  : l++
             , ERROR   : "ERR!"
@@ -59,6 +43,7 @@ Object.keys(LEVEL).forEach(function (l) {
 COLOR[LEVEL.silly] = 30
 COLOR[LEVEL.verbose] = "34;40"
 COLOR[LEVEL.info] = 32
+COLOR[LEVEL.http] = "32;40"
 COLOR[LEVEL.warn] = "30;41"
 COLOR[LEVEL.error] = "31;40"
 for (var c in COLOR) COLOR[LEVEL[c]] = COLOR[c]

diff --git a/lib/utils/npm-registry-client/request.js b/lib/utils/npm-registry-client/request.js
@@ -23,8 +23,6 @@ function regRequest (method, where, what, etag, nofollow, cb_) {
   if (typeof cb_ !== "function") cb_ = etag, etag = null
   if (typeof cb_ !== "function") cb_ = what, what = null
 
-  log.verbose(where||"/", method)
-
   // Since there are multiple places where an error could occur,
   // don't let the cb be called more than once.
   var errState = null
@@ -119,6 +117,8 @@ function makeRequest (method, remote, where, what, etag, nofollow, cb) {
     opts.followRedirect = false
   }
 
+  log.http(remote.pathname || "/", method)
+
   var req = request(opts, requestDone(method, where, cb))
   var r = npm.config.get("registry")
   if (!r) {
@@ -136,6 +136,8 @@ function makeRequest (method, remote, where, what, etag, nofollow, cb) {
 function requestDone (method, where, cb) { return function (er, response, data) {
   if (er) return cb(er)
 
+  log.http(response.statusCode + " " + url.parse(where).pathname)
+
   var parsed
 
   if (Buffer.isBuffer(data)) {

diff --git a/lib/utils/tar.js b/lib/utils/tar.js
@@ -29,7 +29,10 @@ exports.makeList = makeList
 
 function pack (targetTarball, folder, pkg, dfc, cb) {
   if (typeof cb !== "function") cb = dfc, dfc = true
-  folder = path.resolve(process.cwd(), folder)
+  folder = path.resolve(folder)
+
+  log.verbose(folder, "pack")
+
   if (typeof pkg === "function") {
     cb = pkg, pkg = null
     return readJson(path.resolve(folder, "package.json"), function (er, pkg) {