Add global logger for Java internals (forward to Scala global logger)

playframework · Mar 12, 2014 · 8328200 · 8328200
1 parent 759c84f
commit 8328200
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/framework/src/play-java/src/main/java/play/libs/Comet.java b/framework/src/play-java/src/main/java/play/libs/Comet.java
@@ -110,7 +110,7 @@ public void onConnected() {
             try {
                 callback.invoke(this);
             } catch (Throwable e) {
-                play.Logger.of("play").error("Exception in Comet.onConnected", e);
+                play.PlayInternal.logger().error("Exception in Comet.onConnected", e);
             }
         }
     }

diff --git a/framework/src/play-java/src/main/java/play/libs/EventSource.java b/framework/src/play-java/src/main/java/play/libs/EventSource.java
@@ -131,7 +131,7 @@ public void onConnected() {
             try {
                 callback.invoke(this);
             } catch (Throwable e) {
-                play.Logger.of("play").error("Exception in EventSource.onConnected", e);
+                play.PlayInternal.logger().error("Exception in EventSource.onConnected", e);
             }
         }
     }

diff --git a/framework/src/play/src/main/java/play/PlayInternal.java b/framework/src/play/src/main/java/play/PlayInternal.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2009-2013 Typesafe Inc. <http://www.typesafe.com>
+ */
+package play;
+
+/**
+ * Play internal global API.
+ */
+public class PlayInternal {
+  /*
+   * Global logger for Play internals.
+   */
+  public static org.slf4j.Logger logger() {
+    return play.api.Play$.MODULE$.logger().underlyingLogger();
+  }
+}
diff --git a/framework/src/play/src/main/java/play/mvc/Results.java b/framework/src/play/src/main/java/play/mvc/Results.java
@@ -1107,7 +1107,7 @@ public void invoke() throws Throwable {
                         try {
                             callback.invoke();
                         } catch(Throwable e) {
-                            play.Logger.of("play").error("Exception is Chunks disconnected callback", e);
+                            play.PlayInternal.logger().error("Exception is Chunks disconnected callback", e);
                         }
                     }
                 }

diff --git a/framework/src/play/src/main/java/play/mvc/WebSocket.java b/framework/src/play/src/main/java/play/mvc/WebSocket.java
@@ -97,7 +97,7 @@ public void onReady(In<A> in, Out<A> out) {
             try {
                 callback.invoke(in, out);
             } catch (Throwable e) {
-                play.Logger.of("play").error("Exception in WebSocket.onReady", e);
+                play.PlayInternal.logger().error("Exception in WebSocket.onReady", e);
             }
         }
     }