Don't print the whole stack so often

cpltn · Jul 24, 2012 · cf4f225 · cf4f225
1 parent df9f194
commit cf4f225
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/utils/error-handler.js b/lib/utils/error-handler.js
@@ -93,20 +93,22 @@ function errorHandler (er) {
   var m = er.code || er.message.match(/^(?:Error: )?(E[A-Z]+)/)
   if (m && !er.code) er.code = m
 
-  var didStack = false
+  var printStack = false
   switch (er.code) {
   case "ECONNREFUSED":
     log.error("", er)
     log.error("", ["\nIf you are behind a proxy, please make sure that the"
               ,"'proxy' config is set properly.  See: 'npm help config'"
               ].join("\n"))
+    printStack = true
     break
 
   case "EACCES":
   case "EPERM":
     log.error("", er)
     log.error("", ["\nPlease try running this command again as root/Administrator."
               ].join("\n"))
+    printStack = true
     break
 
   case "ELIFECYCLE":
@@ -209,7 +211,6 @@ function errorHandler (er) {
     } // else passthrough
 
   default:
-    didStack = true
     log.error("", er.stack || er.message || er)
     log.error("", ["If you need help, you may report this log at:"
                   ,"    <http://github.com/isaacs/npm/issues>"
@@ -229,6 +230,9 @@ function errorHandler (er) {
   log.error("node -v", process.version)
   log.error("npm -v", npm.version)
 
+  // if we're not going to print it below, still save it to the log
+  if (!printStack) log.silly("stack", er.stack || er.message)
+
   ; [ "file"
     , "path"
     , "type"
@@ -246,7 +250,7 @@ function errorHandler (er) {
     ].forEach(function (k) {
       var v = er[k]
       if (k === "stack") {
-        if (didStack) return
+        if (!printStack) return
         if (!v) v = er.message
       }
       if (!v) return