aboutsummaryrefslogtreecommitdiff
path: root/kamon-core/src/main/scala/kamon/supervisor
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2015-02-14 11:04:22 +0100
committerIvan Topolnjak <ivantopo@gmail.com>2015-02-14 11:31:22 +0100
commit66b35556aa1bf0975cefa35603660991cdfcc526 (patch)
tree5bc71343929dcacca0d5576266c271b44e62f6ce /kamon-core/src/main/scala/kamon/supervisor
parent7da906da4fda6c6cd7eb6384bff0aef6b4ba094f (diff)
downloadKamon-66b35556aa1bf0975cefa35603660991cdfcc526.tar.gz
Kamon-66b35556aa1bf0975cefa35603660991cdfcc526.tar.bz2
Kamon-66b35556aa1bf0975cefa35603660991cdfcc526.zip
! core: special treatment of settings.
Diffstat (limited to 'kamon-core/src/main/scala/kamon/supervisor')
-rw-r--r--kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorExtension.scala4
-rw-r--r--kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorSettings.scala6
2 files changed, 5 insertions, 5 deletions
diff --git a/kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorExtension.scala b/kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorExtension.scala
index e47d0216..ddce63fb 100644
--- a/kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorExtension.scala
+++ b/kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorExtension.scala
@@ -62,7 +62,7 @@ class KamonSupervisor(settings: ModuleSupervisorSettings, dynamicAccess: Dynamic
} getOrElse (childPromise.complete(Success(context.actorOf(props, name))))
def init(): Unit = {
- if (settings.modulesRequiringAspectJ.nonEmpty && !isAspectJPresent && !settings.disableAspectJMissingWarning)
+ if (settings.modulesRequiringAspectJ.nonEmpty && !isAspectJPresent && settings.showAspectJMissingWarning)
logAspectJWeaverMissing(settings.modulesRequiringAspectJ)
// Force initialization of all modules marked with auto-start.
@@ -106,7 +106,7 @@ class KamonSupervisor(settings: ModuleSupervisorSettings, dynamicAccess: Dynamic
|
| If you need help on setting up the aspectj weaver go to http://kamon.io/introduction/get-started/ for more info. On the
| other hand, if you are sure that you do not need or do not want to use the weaver then you can disable this error message
- | by changing the kamon.disable-aspectj-missing-warning setting in your configuration file.
+ | by changing the kamon.show-aspectj-missing-warning setting in your configuration file.
|
""".stripMargin
diff --git a/kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorSettings.scala b/kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorSettings.scala
index 1b7d8a2e..c04157aa 100644
--- a/kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorSettings.scala
+++ b/kamon-core/src/main/scala/kamon/supervisor/ModuleSupervisorSettings.scala
@@ -19,7 +19,7 @@ package kamon.supervisor
import akka.actor.ActorSystem
case class AvailableModuleInfo(name: String, extensionClass: String, requiresAspectJ: Boolean, autoStart: Boolean)
-case class ModuleSupervisorSettings(disableAspectJMissingWarning: Boolean, availableModules: List[AvailableModuleInfo]) {
+case class ModuleSupervisorSettings(showAspectJMissingWarning: Boolean, availableModules: List[AvailableModuleInfo]) {
val modulesRequiringAspectJ = availableModules.filter(_.requiresAspectJ)
}
@@ -29,7 +29,7 @@ object ModuleSupervisorSettings {
import kamon.util.ConfigTools.Syntax
val config = system.settings.config.getConfig("kamon.modules")
- val disableAspectJMissingWarning = system.settings.config.getBoolean("kamon.disable-aspectj-missing-warning")
+ val showAspectJMissingWarning = system.settings.config.getBoolean("kamon.show-aspectj-missing-warning")
val modules = config.firstLevelKeys
val availableModules = modules.map { moduleName ⇒
@@ -43,7 +43,7 @@ object ModuleSupervisorSettings {
} toList
- ModuleSupervisorSettings(disableAspectJMissingWarning, availableModules)
+ ModuleSupervisorSettings(showAspectJMissingWarning, availableModules)
}
}