Add a shutdown method

FlorianDoublet · FlorianDoublet · commit 422253a05631 · 2019-11-26T15:20:37.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
 ## [Unreleased] - no_due_date
 
+- **Add a `shutdown` method to fix this issue: https://github.com/googlemaps/google-maps-services-java/issues/261**
+
+## [1.0.0] - 2019-11-21
+
 - **First version of JRuby Scala Distances**
diff --git a/README.md b/README.md
@@ -51,3 +51,12 @@ Now you can call the method `getDrivingDistance` like this :
         -> (distance) { Success({ distance: distance.length.value, duration: distance.duration.toMinutes }) }  
       )
 ```
+
+
+Then don't forget to add an `at_exit` in your ruby code to cleanup all threads at exits :
+
+```ruby
+at_exit do
+  scalaDistanceApi.shutdown if scalaDistanceApi.present?
+end
+```
diff --git a/src/main/scala/com/colisweb/jrubyscaladistances/JRubyScalaDistance.scala b/src/main/scala/com/colisweb/jrubyscaladistances/JRubyScalaDistance.scala
@@ -10,31 +10,29 @@ import com.colisweb.distances.providers.google.{
 }
 import com.colisweb.distances.{DistanceApi, TravelMode, Types, _}
 import com.google.maps.OkHttpRequestHandler
-import eu.timepit.refined.api.Refined
-import eu.timepit.refined.auto._
 import org.slf4j.LoggerFactory
 
 import scala.concurrent.ExecutionContext
-import scala.concurrent.duration.{Duration, FiniteDuration}
 import scala.util.Try
 
 final class JRubyScalaDistance(googleApiConfig: GoogleApiConfiguration, redisConfig: RedisConfiguration) {
 
   implicit val contextShift: ContextShift[IO] = IO.contextShift(ExecutionContext.global)
 
+  val logger   = LoggerFactory.getLogger(classOf[OkHttpRequestHandler])
+  val loggingF = (message: String) => logger.debug(message.replaceAll("key=([^&]*)&", "key=REDACTED&"))
+
+  val googleGeoApiContext = GoogleGeoApiContext(
+    googleApiConfig.apiKey,
+    googleApiConfig.connectTimeout,
+    googleApiConfig.readTimeout,
+    googleApiConfig.queryRateLimit,
+    loggingF
+  )
+
   val distanceApi: DistanceApi[IO, GoogleDistanceProviderError] = {
-    val logger   = LoggerFactory.getLogger(classOf[OkHttpRequestHandler])
-    val loggingF = (message: String) => logger.debug(message.replaceAll("key=([^&]*)&", "key=REDACTED&"))
 
-    val distanceProvider = GoogleDistanceProvider[IO](
-      GoogleGeoApiContext(
-        googleApiConfig.apiKey,
-        googleApiConfig.connectTimeout,
-        googleApiConfig.readTimeout,
-        googleApiConfig.queryRateLimit,
-        loggingF
-      )
-    )
+    val distanceProvider = GoogleDistanceProvider[IO](googleGeoApiContext)
 
     val cache = RedisCache[IO](
       caches.RedisConfiguration(redisConfig.host, redisConfig.port),
@@ -52,17 +50,18 @@ final class JRubyScalaDistance(googleApiConfig: GoogleApiConfiguration, redisCon
       origin: LatLong,
       destination: LatLong,
       travelMode: TravelMode
-  ): Try[Types.Distance] = 
+  ): Try[Types.Distance] =
     distanceApi
       .distance(origin, destination, List(travelMode))
       .unsafeRunSync()
       .getOrElse(travelMode, Left(new RuntimeException("Unknown travelMode exception happened")))
       .toTry
 
-
   def getDrivingDistance(
       origin: LatLong,
       destination: LatLong
   ): Try[Types.Distance] = getDistance(origin, destination, TravelMode.Driving)
 
+  def shutdown(): Unit = googleGeoApiContext.geoApiContext.shutdown()
+
 }
