Use system.registerOnTermination instead of Coordinated shutdown #193
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| /* | ||
| * Copyright 2016 Dennis Vriend | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package akka.persistence.jdbc.util | ||
|
|
||
| import akka.actor.ActorSystem | ||
| import javax.naming.InitialContext | ||
| import akka.persistence.jdbc.config.SlickConfiguration | ||
| import com.typesafe.config.Config | ||
| import slick.basic.DatabaseConfig | ||
| import slick.jdbc.JdbcProfile | ||
| import slick.jdbc.JdbcBackend._ | ||
|
|
||
| /** | ||
| * INTERNAL API | ||
| */ | ||
| @deprecated(message = "Internal API, will be removed in 4.0.0", since = "3.4.0") | ||
| object SlickDriver { | ||
|
|
||
| /** | ||
| * INTERNAL API | ||
| */ | ||
| @deprecated(message = "Internal API, will be removed in 4.0.0", since = "3.4.0") | ||
| def forDriverName(config: Config): JdbcProfile = | ||
| SlickDatabase.profile(config, "slick") | ||
| } | ||
|
|
||
| /** | ||
| * INTERNAL API | ||
| */ | ||
| object SlickDatabase { | ||
|
|
||
| /** | ||
| * INTERNAL API | ||
| */ | ||
| @deprecated(message = "Internal API, will be removed in 4.0.0", since = "3.4.0") | ||
| def forConfig(config: Config, slickConfiguration: SlickConfiguration): Database = { | ||
| database(config, slickConfiguration, "slick.db") | ||
| } | ||
|
|
||
| /** | ||
| * INTERNAL API | ||
| */ | ||
| private[jdbc] def profile(config: Config, path: String): JdbcProfile = | ||
| DatabaseConfig.forConfig[JdbcProfile](path, config).profile | ||
|
|
||
| /** | ||
| * INTERNAL API | ||
| */ | ||
| private[jdbc] def database(config: Config, slickConfiguration: SlickConfiguration, path: String): Database = { | ||
| slickConfiguration.jndiName | ||
| .map(Database.forName(_, None)) | ||
| .orElse { | ||
| slickConfiguration.jndiDbName.map( | ||
| new InitialContext().lookup(_).asInstanceOf[Database]) | ||
| } | ||
| .getOrElse(Database.forConfig(path, config)) | ||
| } | ||
|
|
||
| /** | ||
| * INTERNAL API | ||
| */ | ||
| private[jdbc] def strict(config: Config, slickConfiguration: SlickConfiguration, path: String): SlickDatabase = { | ||
| val dbPath = if (path.isEmpty) "db" else s"$path.db" | ||
| StrictSlickDatabase( | ||
| database(config, slickConfiguration, dbPath), | ||
| profile(config, path)) | ||
| } | ||
| } | ||
|
|
||
| trait SlickDatabase { | ||
| def database: Database | ||
| def profile: JdbcProfile | ||
|
|
||
| /** | ||
| * If true, the requesting side usualy a (read/write/snapshot journal) | ||
| * should shutdown the database when it closes. If false, it should leave | ||
| * the database connection pool open, since it might still be used elsewhere. | ||
| */ | ||
| def allowShutdown: Boolean | ||
| } | ||
|
|
||
| case class StrictSlickDatabase(database: Database, profile: JdbcProfile) extends SlickDatabase { | ||
|
There was a problem hiding this comment. I am not really sure if this is the best name for the "simple" version if the SlickDatabase. Any suggestions? There was a problem hiding this comment. Maybe we should call it |
||
| override def allowShutdown: Boolean = true | ||
| } | ||
|
|
||
| /** | ||
| * A LazySlickDatabase lazily initializes a database, it also manages the shutdown of the database | ||
| * @param config The configuration used to create the database | ||
| */ | ||
| class LazySlickDatabase(config: Config, system: ActorSystem) extends SlickDatabase { | ||
| val profile: JdbcProfile = SlickDatabase.profile(config, path = "") | ||
|
|
||
| lazy val database: Database = { | ||
| val db = SlickDatabase.database(config, new SlickConfiguration(config), path = "db") | ||
| system.registerOnTermination { | ||
| db.close() | ||
|
|
||
| } | ||
| db | ||
| } | ||
|
|
||
| /** This database shutdown is managed by the db holder, so users of this db do not need to bother shutting it down */ | ||
| override def allowShutdown: Boolean = false | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo: usually