diff options
| author | Diego Parra <diegolparra@gmail.com> | 2016-01-08 17:22:13 -0300 |
|---|---|---|
| committer | Diego Parra <diegolparra@gmail.com> | 2016-01-08 17:22:13 -0300 |
| commit | c52cd5ff46749d905455395ccc9dd821d8730f2b (patch) | |
| tree | 0ec4962bb5a871c287dd3bdbb242a283e8f63d35 | |
| parent | 9899b33351ad769558b0bcd9af4533b070c91162 (diff) | |
| parent | 25ec1429658238dfa9d3cc990a2c5c83651978b4 (diff) | |
| download | Kamon-c52cd5ff46749d905455395ccc9dd821d8730f2b.tar.gz Kamon-c52cd5ff46749d905455395ccc9dd821d8730f2b.tar.bz2 Kamon-c52cd5ff46749d905455395ccc9dd821d8730f2b.zip | |
Merge pull request #302 from trobert/master
= core: don't throw MathError when auto-start is disabled for a module #300
| -rw-r--r-- | kamon-core/src/main/scala/kamon/ModuleLoader.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kamon-core/src/main/scala/kamon/ModuleLoader.scala b/kamon-core/src/main/scala/kamon/ModuleLoader.scala index ac0511c5..602ee819 100644 --- a/kamon-core/src/main/scala/kamon/ModuleLoader.scala +++ b/kamon-core/src/main/scala/kamon/ModuleLoader.scala @@ -35,7 +35,7 @@ private[kamon] class ModuleLoaderExtension(system: ExtendedActorSystem) extends logAspectJWeaverMissing(settings.modulesRequiringAspectJ) // Force initialization of all modules marked with auto-start. - settings.availableModules.filter(_.startInfo.nonEmpty).foreach { + settings.availableModules.foreach { case AvailableModuleInfo(name, requiresAJ, Some(ModuleStartInfo(autoStart, extensionClass))) if autoStart ⇒ system.dynamicAccess.getObjectFor[ExtensionId[Kamon.Extension]](extensionClass).map { moduleID ⇒ @@ -46,6 +46,8 @@ private[kamon] class ModuleLoaderExtension(system: ExtendedActorSystem) extends case th: Throwable ⇒ log.error(s"Failed to auto start the [$name] module.", th) } + case _ ⇒ //ignore + } // When AspectJ is present the kamon.supervisor.AspectJPresent aspect will make this return true. |