jooby:run fail on app.js fix #406

Author: jknack

jooby-hotreload/src/main/java/org/jooby/hotreload/AppModule.java

@@ -30,15 +30,14 @@
 import java.nio.file.Path;
 import java.nio.file.PathMatcher;
 import java.nio.file.WatchEvent.Kind;
-import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
 
 import org.jboss.modules.Module;
 import org.jboss.modules.ModuleClassLoader;
@@ -147,6 +146,7 @@ public void run() {
     this.startApp();
   }
 
+  @SuppressWarnings("rawtypes")
   private void startApp() {
     if (app != null) {
       stopApp(app);
@@ -160,18 +160,20 @@ private void startApp() {
 
         Thread.currentThread().setContextClassLoader(mcloader);
 
-        if (mainClass.equals("org.jooby.Jooby")) {
+        Class<?> joobyClass = mcloader.loadClass("org.jooby.Jooby");
+        if (mainClass.equals(joobyClass.getName())) {
           // js version
           Object js = mcloader.loadClass("org.jooby.internal.js.JsJooby")
               .newInstance();
           Method runjs = js.getClass().getDeclaredMethod("run", File.class);
-          this.app = runjs.invoke(js, new File("app.js"));
+          this.app = ((Supplier) runjs.invoke(js, new File("app.js"))).get();
         } else {
-          this.app = mcloader.loadClass(mainClass)
+          this.app = joobyClass
               .getDeclaredConstructors()[0].newInstance();
         }
         debug("starting: %s", mainClass);
-        app.getClass().getMethod("start").invoke(app);
+        Method joobyRun = joobyClass.getMethod("start");
+        joobyRun.invoke(this.app);
       } catch (Throwable ex) {
         Throwable cause = ex;
         if (ex instanceof InvocationTargetException) {
@@ -272,6 +274,7 @@ private static void logLevel() {
     TRACE = "trace".equalsIgnoreCase(System.getProperty("logLevel", ""));
 
     if (TRACE) {
+      DEBUG = true;
       Module.setModuleLogger(new ModuleLogger() {
 
         @Override
@@ -357,26 +360,26 @@ public void classDefineFailed(final Throwable throwable, final String className,
   }
 
   public static void info(final String message, final Object... args) {
-    System.out.println(format(message, args));
+    System.out.println(format("info", message, args));
   }
 
   public static void error(final String message, final Object... args) {
-    System.err.println(format(message, args));
+    System.err.println(format("error", message, args));
   }
 
   public static void debug(final String message, final Object... args) {
     if (DEBUG) {
-      System.out.println(format(message, args));
+      System.out.println(format("debug", message, args));
     }
   }
 
   public static void trace(final String message, final Object... args) {
     if (TRACE) {
-      System.out.println(format(message, args));
+      System.out.println(format("trace", message, args));
     }
   }
 
-  private static String format(final String message, final Object... args) {
+  private static String format(final String level, final String message, final Object... args) {
     Object[] values = args;
     Throwable x = null;
     if (args.length > 0) {
@@ -388,10 +391,12 @@ private static String format(final String message, final Object... args) {
     }
     String msg = String.format(message, values);
     StringBuilder buff = new StringBuilder();
-    buff.append("[HotSwap|")
-        .append(Thread.currentThread().getName()).append("|")
-        .append(LocalTime.now().format(DateTimeFormatter.ofPattern("hh:mm:ss")))
-        .append("]: ").append(msg);
+    buff.append(">>> jooby:run[")
+        .append(level)
+        .append("|")
+        .append(Thread.currentThread().getName())
+        .append("]: ")
+        .append(msg);
     if (x != null) {
       buff.append("\n");
       StringWriter writer = new StringWriter();

jooby-hotreload/src/main/java/org/jooby/hotreload/AppModuleLoader.java

@@ -107,8 +107,12 @@ private static Map<ModuleIdentifier, ModuleSpec> newModule(final String name,
         }
       }
     }
-    Set<String> jdkPaths = sysPaths();
-    builder.addDependency(DependencySpec.createSystemDependencySpec(jdkPaths));
+    Set<String> sysPaths = sysPaths();
+
+    AppModule.trace("system packages:");
+    sysPaths.forEach(p -> AppModule.trace("  %s", p));
+
+    builder.addDependency(DependencySpec.createSystemDependencySpec(sysPaths));
     builder.addDependency(DependencySpec.createLocalDependencySpec());
 
     if (mainClass != null) {