aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn St John <johnthesaintjohn@gmail.com>2017-09-27 12:07:15 -0700
committerJohn St John <johnthesaintjohn@gmail.com>2017-09-27 12:07:15 -0700
commitb7018717bdaa2473b5ebf710a2e263ab520c3b65 (patch)
tree8ef8032128bd292ddb939f243aa055d2a3fce804
parentf82019a2131a7f2042ba7f7d2d25a54c3c186c9c (diff)
downloaddriver-core-b7018717bdaa2473b5ebf710a2e263ab520c3b65.tar.gz
driver-core-b7018717bdaa2473b5ebf710a2e263ab520c3b65.tar.bz2
driver-core-b7018717bdaa2473b5ebf710a2e263ab520c3b65.zip
use standard try catch
-rw-r--r--src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala b/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala
index ed05517..08969d8 100644
--- a/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala
+++ b/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala
@@ -1,9 +1,11 @@
package xyz.driver.core.trace
-import com.google.cloud.trace.v1.consumer.{FlushableTraceConsumer}
+import com.google.cloud.trace.v1.consumer.FlushableTraceConsumer
import com.google.devtools.cloudtrace.v1.Traces
import com.typesafe.scalalogging.Logger
+
import scala.util.Try
+import scala.util.control.NonFatal
/**
* ExceptionLoggingFlushableTraceConsumer simply wraps a flushable trace consumer and catches/logs any exceptions
@@ -19,8 +21,16 @@ class ExceptionLoggingFlushableTraceConsumer(traceConsumer: FlushableTraceConsum
log.error(s"Encountered exception logging to google $exception")
override def receive(trace: Traces): Unit =
- Try(flushableTraceConsumer.receive(trace)).recover({ case e => exceptionLogger(e) }).get
+ try {
+ flushableTraceConsumer.receive(trace)
+ } catch {
+ case NonFatal(e) => exceptionLogger(e)
+ }
override def flush(): Unit =
- Try(flushableTraceConsumer.flush()).recover({ case e => exceptionLogger(e) }).get
+ try {
+ flushableTraceConsumer.flush()
+ } catch {
+ case NonFatal(e) => exceptionLogger(e)
+ }
}