raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #28256 from akka/revertExtensionLoadFailureHandling

Browse source 
Revert to old extension load failure handling logic
This commit is contained in:
Patrik Nordwall 2019-11-27 12:58:59 +01:00 • committed by GitHub
commit db141d0373
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
akka-actor/src/main/scala/akka/actor/ActorSystem.scala
View file

@ -1179,29 +1179,25 @@ private[akka] class ActorSystemImpl(
private def loadExtensions(): Unit = { private def loadExtensions(): Unit = {
/* /*
* @param throwOnLoadFail Throw exception when an extension fails to load (needed for backwards compatibility) * @param throwOnLoadFail
* Throw exception when an extension fails to load (needed for backwards compatibility.
* when the extension cannot be found at all we throw regardless of this setting)
*/ */
def loadExtensions(key: String, throwOnLoadFail: Boolean): Unit = { def loadExtensions(key: String, throwOnLoadFail: Boolean): Unit = {
def handleException(fqcn: String, problem: Throwable): Unit = {
if (!throwOnLoadFail) log.error(problem, "While trying to load extension [{}], skipping...", fqcn)
else throw new RuntimeException(s"While trying to load extension [$fqcn]", problem)
}
immutableSeq(settings.config.getStringList(key)).foreach { fqcn => immutableSeq(settings.config.getStringList(key)).foreach { fqcn =>
dynamicAccess.getObjectFor[AnyRef](fqcn).recoverWith { dynamicAccess.getObjectFor[AnyRef](fqcn).recoverWith {
case _ => dynamicAccess.createInstanceFor[AnyRef](fqcn, Nil) case _ => dynamicAccess.createInstanceFor[AnyRef](fqcn, Nil)
} match { } match {
case Success(p: ExtensionIdProvider) => case Success(p: ExtensionIdProvider) =>
try registerExtension(p.lookup()) registerExtension(p.lookup())
catch { case NonFatal(e) => handleException(fqcn, e) }
case Success(p: ExtensionId[_]) => case Success(p: ExtensionId[_]) =>
try registerExtension(p) registerExtension(p)
catch { case NonFatal(e) => handleException(fqcn, e) }
case Success(_) => case Success(_) =>
if (!throwOnLoadFail) log.error("[{}] is not an 'ExtensionIdProvider' or 'ExtensionId', skipping...", fqcn) if (!throwOnLoadFail) log.error("[{}] is not an 'ExtensionIdProvider' or 'ExtensionId', skipping...", fqcn)
else throw new RuntimeException(s"[$fqcn] is not an 'ExtensionIdProvider' or 'ExtensionId'") else throw new RuntimeException(s"[$fqcn] is not an 'ExtensionIdProvider' or 'ExtensionId'")
case Failure(problem) => case Failure(problem) =>
handleException(fqcn, problem) if (!throwOnLoadFail) log.error(problem, "While trying to load extension [{}], skipping...", fqcn)
else throw new RuntimeException(s"While trying to load extension [$fqcn]", problem)
} }
} }
} }