remove stopOffset - register database shutdown on termination for Slick

Author: fupelaqu

core/src/main/scala/app/softnetwork/persistence/query/OffsetProvider.scala

@@ -31,8 +31,4 @@ trait OffsetProvider { _: EventStream =>
     */
   protected def writeOffset(offset: Offset): Future[Done]
 
-  protected def stopOffset(): Unit = ()
-
-  sys.addShutdownHook(stopOffset())
-
 }

jdbc/src/main/scala/app/softnetwork/persistence/jdbc/db/SlickDatabase.scala

@@ -24,14 +24,17 @@ trait SlickDatabase extends ClasspathResources {
 
   lazy val db: Database = {
     log.info(profile)
-    SlickExtension(classicSystem).database(config).database
+    val db = SlickExtension(classicSystem).database(config).database
+    classicSystem.registerOnTermination(shutdown())
+    db
   }
 
-  sys.addShutdownHook(shutdown())
-
   def shutdown(): Unit = {
     log.info(s"Shutting down database")
-    db.shutdown
+    Try(db.shutdown) match {
+      case Success(_) =>
+      case Failure(f) => log.error(f.getMessage)
+    }
   }
 
   def withFile(file: String, separator: String = ";"): Unit = {

jdbc/src/main/scala/app/softnetwork/persistence/jdbc/query/JdbcOffsetProvider.scala

@@ -134,8 +134,4 @@ trait JdbcOffsetProvider extends OffsetProvider with SlickDatabase { _: EventStr
     }
   }
 
-  override protected def stopOffset(): Unit = {
-    log.info("Stopping Offset")
-    session.close()
-  }
 }