From 4925d7840a40c562c8e48d92b7f38ba6d39099c5 Mon Sep 17 00:00:00 2001
From: Christopher Vogt <oss.nsp@cvogt.org>
Date: Mon, 27 Feb 2017 20:07:58 +0800
Subject: minor logging improvements

---
 stage1/Stage1Lib.scala | 2 +-
 stage1/logger.scala    | 4 +++-
 stage1/resolver.scala  | 5 ++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'stage1')

diff --git a/stage1/Stage1Lib.scala b/stage1/Stage1Lib.scala
index 3b559b5..71e6ee5 100644
--- a/stage1/Stage1Lib.scala
+++ b/stage1/Stage1Lib.scala
@@ -93,7 +93,7 @@ class Stage1Lib( logger: Logger ) extends BaseLib{
 
   def runMain( cls: String, args: Seq[String], classLoader: ClassLoader, fakeInstance: Boolean = false ): ExitCode = {
     import java.lang.reflect.Modifier
-    logger.lib(s"Running $cls.main($args) with classLoader: " ++ classLoader.toString)
+    logger.run(s"Running $cls.main($args) with classLoader: " ++ classLoader.toString)
     trapExitCode{
       val c = classLoader.loadClass(cls)
       val m = c.getMethod( "main", classOf[Array[String]] )
diff --git a/stage1/logger.scala b/stage1/logger.scala
index 8c8431a..373a954 100644
--- a/stage1/logger.scala
+++ b/stage1/logger.scala
@@ -20,7 +20,7 @@ case class Logger(enabledLoggers: Set[String], start: Long) {
   def log(name: String, msg: => String) = {
     if(
       (
-      (enabledLoggers contains name)
+        (enabledLoggers contains name)
         || (enabledLoggers contains "all")
       ) && !(disabledLoggers contains name)
     ){
@@ -41,6 +41,7 @@ case class Logger(enabledLoggers: Set[String], start: Long) {
   final def git(msg: => String) = log(names.git, msg)
   final def pom(msg: => String) = log(names.pom, msg)
   final def dynamic(msg: => String) = log(names.dynamic, msg)
+  final def run(msg: => String) = log(names.run, msg)
   final def transientCache(msg: => String) = log(names.transientCache, msg)
 
   private object names{
@@ -53,6 +54,7 @@ case class Logger(enabledLoggers: Set[String], start: Long) {
     val lib = "lib"
     val test = "test"
     val pom = "pom"
+    val run = "run"
     val git = "git"
     val dynamic = "dynamic"
     val transientCache = "transientCache"
diff --git a/stage1/resolver.scala b/stage1/resolver.scala
index 8dcecfc..cf441d2 100644
--- a/stage1/resolver.scala
+++ b/stage1/resolver.scala
@@ -288,7 +288,10 @@ case class BoundMavenDependency(
   def jar: File = taskCache[BoundMavenDependency]("jar").memoize{ resolve("jar", Some(jarSha1), true) }
   def pom: File = taskCache[BoundMavenDependency]("pom").memoize{ resolve("pom", Some(pomSha1), false) }
 
-  private def pomXml = XML.loadFile(pom.string)
+  private def pomXml = {
+    logger.resolver( "Loading pom file: " ++ pom.string )
+    XML.loadFile(pom.string)
+  }
   // ========== pom traversal ==========
 
   private lazy val transitivePom: Seq[BoundMavenDependency] = {
-- 
cgit v1.2.3