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

Reusing akka.output.config.source system property to output default values when set to non-null value, closing ticket #573

Browse source
This commit is contained in:
Viktor Klang 2011-05-12 16:14:38 +02:00
parent d3e29e8ffa
commit 53cf5079fd
2 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor/src/main/scala/akka/config/Config.scala
View file

@ -74,7 +74,7 @@ object Config {
throw new ConfigurationException(
"Akka JAR version [" + VERSION + "] is different than the provided config version [" + configVersion + "]")
if(System.getProperty("akka.output.config.source") ne null)
if(Configuration.outputConfigSources)
System.out.println(source)
i

33
akka-actor/src/main/scala/akka/config/Configuration.scala
View file

@ -15,6 +15,8 @@ object Configuration {
val DefaultPath = new File(".").getCanonicalPath
val DefaultImporter = new FilesystemImporter(DefaultPath)
val outputConfigSources = System.getProperty("akka.output.config.source") ne null
def load(data: String, importer: Importer = DefaultImporter): Configuration = {
val parser = new ConfigParser(importer = importer)
new Configuration(parser parse data)
@ -60,6 +62,13 @@ class Configuration(val map: Map[String, Any]) {
private val trueValues = Set("true", "on")
private val falseValues = Set("false", "off")
private def outputIfDesiredAndReturnInput[T](key: String, t: T): T = {
if (Configuration.outputConfigSources)
println("Akka config is using default value for: " + key)
t
}
def contains(key: String): Boolean = map contains key
def keys: Iterable[String] = map.keys
@ -72,7 +81,8 @@ class Configuration(val map: Map[String, Any]) {
}
}
def getAny(key: String, defaultValue: Any): Any = getAny(key).getOrElse(defaultValue)
def getAny(key: String, defaultValue: Any): Any =
getAny(key).getOrElse(outputIfDesiredAndReturnInput(key, defaultValue))
def getSeqAny(key: String): Seq[Any] = {
try {
@ -84,7 +94,8 @@ class Configuration(val map: Map[String, Any]) {
def getString(key: String): Option[String] = map.get(key).map(_.toString)
def getString(key: String, defaultValue: String): String = getString(key).getOrElse(defaultValue)
def getString(key: String, defaultValue: String): String =
getString(key).getOrElse(outputIfDesiredAndReturnInput(key, defaultValue))
def getList(key: String): Seq[String] = {
try {
@ -102,7 +113,8 @@ class Configuration(val map: Map[String, Any]) {
}
}
def getInt(key: String, defaultValue: Int): Int = getInt(key).getOrElse(defaultValue)
def getInt(key: String, defaultValue: Int): Int =
getInt(key).getOrElse(outputIfDesiredAndReturnInput(key, defaultValue))
def getLong(key: String): Option[Long] = {
try {
@ -112,7 +124,8 @@ class Configuration(val map: Map[String, Any]) {
}
}
def getLong(key: String, defaultValue: Long): Long = getLong(key).getOrElse(defaultValue)
def getLong(key: String, defaultValue: Long): Long =
getLong(key).getOrElse(outputIfDesiredAndReturnInput(key, defaultValue))
def getFloat(key: String): Option[Float] = {
try {
@ -122,7 +135,8 @@ class Configuration(val map: Map[String, Any]) {
}
}
def getFloat(key: String, defaultValue: Float): Float = getFloat(key).getOrElse(defaultValue)
def getFloat(key: String, defaultValue: Float): Float =
getFloat(key).getOrElse(outputIfDesiredAndReturnInput(key, defaultValue))
def getDouble(key: String): Option[Double] = {
try {
@ -132,7 +146,8 @@ class Configuration(val map: Map[String, Any]) {
}
}
def getDouble(key: String, defaultValue: Double): Double = getDouble(key).getOrElse(defaultValue)
def getDouble(key: String, defaultValue: Double): Double =
getDouble(key).getOrElse(outputIfDesiredAndReturnInput(key, defaultValue))
def getBoolean(key: String): Option[Boolean] = {
getString(key) flatMap { s =>
@ -142,11 +157,13 @@ class Configuration(val map: Map[String, Any]) {
}
}
def getBoolean(key: String, defaultValue: Boolean): Boolean = getBool(key).getOrElse(defaultValue)
def getBoolean(key: String, defaultValue: Boolean): Boolean =
getBool(key).getOrElse(outputIfDesiredAndReturnInput(key, defaultValue))
def getBool(key: String): Option[Boolean] = getBoolean(key)
def getBool(key: String, defaultValue: Boolean): Boolean = getBoolean(key, defaultValue)
def getBool(key: String, defaultValue: Boolean): Boolean =
getBoolean(key, defaultValue)
def apply(key: String): String = getString(key) match {
case None => throw new ConfigurationException("undefined config: " + key)