Merge pull request #1918 from lift/ajk-log-exceptions

farmdawgnation · web-flow · commit aa24c2d966d0 · 2017-09-15T14:12:29.000-04:00
Log exceptions too when logging errors
diff --git a/core/util/src/main/scala/net/liftweb/util/Schedule.scala b/core/util/src/main/scala/net/liftweb/util/Schedule.scala
@@ -151,7 +151,7 @@ sealed trait Schedule extends Loggable {
           try {
             f.apply()
           } catch {
-            case e: Exception => logger.error(e)
+            case e: Exception => logger.error(e.getMessage, e)
           }
         }
       }
@@ -162,7 +162,7 @@ sealed trait Schedule extends Loggable {
             Schedule.this.restart
             pool.execute(r)
           } catch {
-            case e: Exception => logger.error(e)
+            case e: Exception => logger.error(e.getMessage, e)
           }
         }
       }
diff --git a/web/webkit/src/main/scala/net/liftweb/builtin/snippet/Embed.scala b/web/webkit/src/main/scala/net/liftweb/builtin/snippet/Embed.scala
@@ -79,6 +79,10 @@ object Embed extends DispatchSnippet {
 
       bindFn(template)
     }
+    case Failure(msg, Full(ex), _) =>
+      logger.error("'embed' snippet failed with message: "+msg, ex)
+      throw new SnippetExecutionException("Embed Snippet failed: "+msg)
+
     case Failure(msg, _, _) =>
       logger.error("'embed' snippet failed with message: "+msg)
       throw new SnippetExecutionException("Embed Snippet failed: "+msg)
diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
@@ -2106,6 +2106,7 @@ class LiftSession(private[http] val _contextPath: String, val underlyingId: Stri
           in.!(xlate(p) match {
             case Full(v) => v
             case Empty => logger.error("Failed to deserialize JSON message "+p); p
+            case Failure(msg, Full(ex), _) => logger.error("Failed to deserialize JSON message "+p+". Error "+msg, ex); p
             case Failure(msg, _, _) => logger.error("Failed to deserialize JSON message "+p+". Error "+msg); p
           })
           JsCmds.Noop

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ sealed trait Schedule extends Loggable {`
`151`	`151`	`try {`
`152`	`152`	`f.apply()`
`153`	`153`	`} catch {`
`154`		`- case e: Exception => logger.error(e)`
	`154`	`+ case e: Exception => logger.error(e.getMessage, e)`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`}`
`@@ -162,7 +162,7 @@ sealed trait Schedule extends Loggable {`
`162`	`162`	`Schedule.this.restart`
`163`	`163`	`pool.execute(r)`
`164`	`164`	`} catch {`
`165`		`- case e: Exception => logger.error(e)`
	`165`	`+ case e: Exception => logger.error(e.getMessage, e)`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`