src/main/scala/s3/website/package.scala in s3_website-2.1.12 vs src/main/scala/s3/website/package.scala in s3_website-2.1.13

- old
+ new

@@ -11,27 +11,29 @@ trait Report { def reportMessage: String } trait SuccessReport extends Report - trait FailureReport extends Report - trait ErrorReport extends Report object ErrorReport { def apply(t: Throwable)(implicit logger: Logger) = new ErrorReport { - override def reportMessage = { - val extendedReport = - if (logger.verboseOutput) - Some(t.getStackTrace take 5) - else - None - s"${t.getMessage}${extendedReport.fold("")(stackTraceElems => "\n" + stackTraceElems.mkString("\n"))}" - } + override def reportMessage = errorMessage(t) } def apply(msg: String) = new ErrorReport { override def reportMessage = msg + } + + def errorMessage(msg: String, t: Throwable)(implicit logger: Logger): String = s"$msg (${errorMessage(t)})" + + def errorMessage(t: Throwable)(implicit logger: Logger): String = { + val extendedReport = + if (logger.verboseOutput) + Some(t.getStackTrace) + else + None + s"${t.getMessage}${extendedReport.fold("")(stackTraceElems => "\n" + stackTraceElems.mkString("\n"))}" } } trait RetrySetting { def retryTimeUnit: TimeUnit