From 80b4c45ce4e6b35dfb3455a200082d7589c9f72d Mon Sep 17 00:00:00 2001 From: John St John Date: Wed, 27 Sep 2017 11:50:17 -0700 Subject: 2_11 does not support .fold on Trys --- .../core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala b/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala index 64ae15a..fd3a843 100644 --- a/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala +++ b/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala @@ -19,8 +19,8 @@ class ExceptionLoggingFlushableTraceConsumer(traceConsumer: FlushableTraceConsum log.error(s"Encountered exception logging to google $exception") override def receive(trace: Traces): Unit = - Try(flushableTraceConsumer.receive(trace)).fold(exceptionLogger, identity) + Try(flushableTraceConsumer.receive(trace)).recover({case e => exceptionLogger(e)}).get override def flush(): Unit = - Try(flushableTraceConsumer.flush()).fold(exceptionLogger, identity) + Try(flushableTraceConsumer.flush()).recover({case e => exceptionLogger(e)}).get } -- cgit v1.2.3 From 6ada9db263dc9b19e0ca1ad1ac90453b2f375d3a Mon Sep 17 00:00:00 2001 From: John St John Date: Wed, 27 Sep 2017 11:56:59 -0700 Subject: fix format error --- .../core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala b/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala index fd3a843..ed05517 100644 --- a/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala +++ b/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala @@ -19,8 +19,8 @@ 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)).recover({ case e => exceptionLogger(e) }).get override def flush(): Unit = - Try(flushableTraceConsumer.flush()).recover({case e => exceptionLogger(e)}).get + Try(flushableTraceConsumer.flush()).recover({ case e => exceptionLogger(e) }).get } -- cgit v1.2.3 From b7018717bdaa2473b5ebf710a2e263ab520c3b65 Mon Sep 17 00:00:00 2001 From: John St John Date: Wed, 27 Sep 2017 12:07:15 -0700 Subject: use standard try catch --- .../ExceptionLoggingSizedBufferingTraceConsumer.scala | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src') 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) + } } -- cgit v1.2.3 From c609f18cb0cd209427b4e9c10a507cfa5ed4ea9e Mon Sep 17 00:00:00 2001 From: John St John Date: Wed, 27 Sep 2017 12:12:39 -0700 Subject: remove unused import --- .../driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala b/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala index 08969d8..399e2c6 100644 --- a/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala +++ b/src/main/scala/xyz/driver/core/trace/ExceptionLoggingSizedBufferingTraceConsumer.scala @@ -4,7 +4,6 @@ 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 /** -- cgit v1.2.3