add View.appliedTo(ActContext) method; further optimize bootstrap log message

greenlaw110 · greenlaw110 · commit f26c01f90344 · 2016-10-25T08:11:59.000+11:00
diff --git a/src/main/java/act/app/App.java b/src/main/java/act/app/App.java
@@ -64,7 +64,7 @@
  */
 public class App extends DestroyableBase {
 
-    public static Logger logger = L.get(App.class);
+    public static Logger logger = Act.logger;
 
     private static App INST;
 
@@ -887,7 +887,7 @@ private void loadRoutes() {
         logger.debug("loading app routing table: %s ...", appBase.getPath());
         File routes = RuntimeDirs.routes(this);
         if (!(routes.isFile() && routes.canRead())) {
-            logger.warn("Cannot find routeTable file: %s", appBase.getPath());
+            logger.debug("No route table find found");
             // guess the app is purely using annotation based routes
             return;
         }
diff --git a/src/main/java/act/app/AppServiceRegistry.java b/src/main/java/act/app/AppServiceRegistry.java
@@ -1,6 +1,7 @@
 package act.app;
 
 import act.Destroyable;
+import act.event.EventBus;
 import org.osgl.$;
 import org.osgl.logging.L;
 import org.osgl.logging.LogManager;
@@ -35,7 +36,10 @@ synchronized void register(final AppService service) {
             tryRegisterSingletonService(c, service);
         } else {
             E.illegalStateIf(isSingletonService(c), "Singleton AppService[%s] cannot be re-registered", c);
-            logger.warn("Service type[%s] already registered", service.getClass());
+            // we know event bus will get registered twice for the `EventBus.onceBus`
+            if (!(service instanceof EventBus)) {
+                logger.warn("Service type[%s] already registered", service.getClass());
+            }
             appendix.add(service);
         }
     }
diff --git a/src/main/java/act/app/CliServer.java b/src/main/java/act/app/CliServer.java
@@ -1,5 +1,6 @@
 package act.app;
 
+import act.Act;
 import act.Destroyable;
 import act.app.event.AppEventId;
 import act.cli.CliSession;
@@ -136,7 +137,7 @@ public void run() {
             app().jobManager().on(AppEventId.POST_START, new Runnable() {
                 @Override
                 public void run() {
-                    logger.info("CLI server started on port: %s", port);
+                    Act.logger.info("CLI server started on port: %s", port);
                 }
             });
         } catch (IOException e) {
diff --git a/src/main/java/act/app/DevModeClassLoader.java b/src/main/java/act/app/DevModeClassLoader.java
@@ -156,7 +156,7 @@ private void scanSources() {
 
             Set<String> classesNeedByteCodeScan = C.newSet();
             if (scanners.isEmpty()) {
-                logger.warn("No source code scanner found");
+                //logger.warn("No source code scanner found");
                 for (String className : sources.keySet()) {
                     classesNeedByteCodeScan.add(className);
                 }
diff --git a/src/main/java/act/mail/MailerConfig.java b/src/main/java/act/mail/MailerConfig.java
@@ -5,6 +5,8 @@
 import act.app.AppHolderBase;
 import org.osgl.exception.ConfigurationException;
 import org.osgl.http.H;
+import org.osgl.logging.LogManager;
+import org.osgl.logging.Logger;
 import org.osgl.util.C;
 import org.osgl.util.E;
 import org.osgl.util.S;
@@ -24,6 +26,8 @@
 @ActComponent
 public class MailerConfig extends AppHolderBase {
 
+    public static final Logger logger = LogManager.get(MailerConfig.class);
+
     public static final String FROM = "from";
     public static final String CONTENT_TYPE = "content_type";
     public static final String LOCALE = "locale";
diff --git a/src/main/java/act/view/View.java b/src/main/java/act/view/View.java
@@ -7,6 +7,7 @@
 import act.plugin.AppServicePlugin;
 import act.plugin.Plugin;
 import act.util.ActContext;
+import org.osgl.http.H;
 import org.osgl.util.C;
 import org.osgl.util.IO;
 import org.osgl.util.S;
@@ -37,6 +38,11 @@ public void run() {
         });
     }
 
+    public boolean appliedTo(ActContext context) {
+        H.Format format = context.accept();
+        return format.isText();
+    }
+
     /**
      * Sub class must implement this method to load the template
      *
diff --git a/src/main/java/act/view/ViewManager.java b/src/main/java/act/view/ViewManager.java
@@ -106,7 +106,7 @@ private Template getTemplate(ActContext context, AppConfig config, String path)
 
         if (multiViews) {
             View preferred = preferredViews.get(templatePath);
-            if (null != preferred) {
+            if (null != preferred && preferred.appliedTo(context)) {
                 template = preferred.loadTemplate(templatePath, context);
                 if (null != template) {
                     context.cacheTemplate(template);
@@ -117,12 +117,12 @@ private Template getTemplate(ActContext context, AppConfig config, String path)
 
         View defView = config.defaultView();
 
-        if (null != defView) {
+        if (null != defView && defView.appliedTo(context)) {
             template = defView.loadTemplate(templatePath, context);
         }
         if (null == template && multiViews) {
             for (View view : viewList) {
-                if (view == defView) continue;
+                if (view == defView || !view.appliedTo(context)) continue;
                 template = view.loadTemplate(templatePath, context);
                 if (null != template) {
                     if (multiViews) {
diff --git a/src/main/java/act/xio/NetworkBase.java b/src/main/java/act/xio/NetworkBase.java
@@ -1,5 +1,6 @@
 package act.xio;
 
+import act.Act;
 import act.Destroyable;
 import act.util.DestroyableBase;
 import org.osgl.logging.LogManager;
@@ -43,7 +44,7 @@ public void start() {
             if (!trySetUpClient(client, port)) {
                 failed.put(port, client);
             } else {
-                logger.info("network client hooked on port: %s", port);
+                Act.logger.info("network client hooked on port: %s", port);
             }
         }
         started = true;

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ private void scanSources() {`
`156`	`156`
`157`	`157`	`Set<String> classesNeedByteCodeScan = C.newSet();`
`158`	`158`	`if (scanners.isEmpty()) {`
`159`		`- logger.warn("No source code scanner found");`
	`159`	`+ //logger.warn("No source code scanner found");`
`160`	`160`	`for (String className : sources.keySet()) {`
`161`	`161`	`classesNeedByteCodeScan.add(className);`
`162`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package act.xio;`
`2`	`2`
	`3`	`+import act.Act;`
`3`	`4`	`import act.Destroyable;`
`4`	`5`	`import act.util.DestroyableBase;`
`5`	`6`	`import org.osgl.logging.LogManager;`
`@@ -43,7 +44,7 @@ public void start() {`
`43`	`44`	`if (!trySetUpClient(client, port)) {`
`44`	`45`	`failed.put(port, client);`
`45`	`46`	`} else {`
`46`		`- logger.info("network client hooked on port: %s", port);`
	`47`	`+ Act.logger.info("network client hooked on port: %s", port);`
`47`	`48`	`}`
`48`	`49`	`}`
`49`	`50`	`started = true;`