From ba957c8356c665ae796d82f1077d30be5fa4881a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= Date: Wed, 20 Feb 2013 10:07:45 +0100 Subject: [PATCH] Change documentation to consistently use quotes for log levels. See #2965 --- .../src/test/scala/akka/event/LoggerSpec.scala | 8 ++++---- akka-docs/rst/general/configuration.rst | 16 +++++++++------- akka-docs/rst/java/testing.rst | 2 +- .../code/docs/actor/FaultHandlingDocSample.scala | 2 +- akka-docs/rst/scala/testing.rst | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala b/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala index 2f97668b4c..cb8d45a44f 100644 --- a/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/event/LoggerSpec.scala @@ -13,15 +13,15 @@ object LoggerSpec { val defaultConfig = ConfigFactory.parseString(""" akka { - stdout-loglevel = WARNING - loglevel = DEBUG + stdout-loglevel = "WARNING" + loglevel = "DEBUG" } """).withFallback(AkkaSpec.testConf) val noLoggingConfig = ConfigFactory.parseString(""" akka { - stdout-loglevel = OFF - loglevel = OFF + stdout-loglevel = "OFF" + loglevel = "OFF" } """).withFallback(AkkaSpec.testConf) } diff --git a/akka-docs/rst/general/configuration.rst b/akka-docs/rst/general/configuration.rst index e55c9add85..d5feabe4d2 100644 --- a/akka-docs/rst/general/configuration.rst +++ b/akka-docs/rst/general/configuration.rst @@ -96,11 +96,11 @@ A custom ``application.conf`` might look like this:: # Log level used by the configured loggers (see "loggers") as soon # as they have been started; before that, see "stdout-loglevel" # Options: OFF, ERROR, WARNING, INFO, DEBUG - loglevel = DEBUG + loglevel = "DEBUG" # Log level for the very basic logger activated during AkkaApplication startup # Options: OFF, ERROR, WARNING, INFO, DEBUG - stdout-loglevel = DEBUG + stdout-loglevel = "DEBUG" actor { default-dispatcher { @@ -222,11 +222,11 @@ from the whole class path, it is easiest to utilize that functionality and differentiate actor systems within the hierarchy of the configuration:: myapp1 { - akka.loglevel = WARNING + akka.loglevel = "WARNING" my.own.setting = 43 } myapp2 { - akka.loglevel = ERROR + akka.loglevel = "ERROR" app2.setting = "appname" } my.own.setting = 42 @@ -245,15 +245,17 @@ system is this .. code-block:: ruby - akka.loglevel = WARNING + akka.loglevel = "WARNING" my.own.setting = 43 my.other.setting = "hello" // plus myapp1 and myapp2 subtrees while in the second one, only the “akka” subtree is lifted, with the following -result:: +result - akka.loglevel = ERROR +.. code-block:: ruby + + akka.loglevel = "ERROR" my.own.setting = 42 my.other.setting = "hello" // plus myapp1 and myapp2 subtrees diff --git a/akka-docs/rst/java/testing.rst b/akka-docs/rst/java/testing.rst index b0828c41d9..0f8311821a 100644 --- a/akka-docs/rst/java/testing.rst +++ b/akka-docs/rst/java/testing.rst @@ -618,7 +618,7 @@ All these messages are logged at ``DEBUG`` level. To summarize, you can enable full logging of actor activities using this configuration fragment:: akka { - loglevel = DEBUG + loglevel = "DEBUG" actor { debug { autoreceive = on diff --git a/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala b/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala index 5be1f9a542..fd54bbcf53 100644 --- a/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala +++ b/akka-docs/rst/scala/code/docs/actor/FaultHandlingDocSample.scala @@ -23,7 +23,7 @@ object FaultHandlingDocSample extends App { import Worker._ val config = ConfigFactory.parseString(""" - akka.loglevel = DEBUG + akka.loglevel = "DEBUG" akka.actor.debug { receive = on lifecycle = on diff --git a/akka-docs/rst/scala/testing.rst b/akka-docs/rst/scala/testing.rst index ac6a63423d..0de33fc35c 100644 --- a/akka-docs/rst/scala/testing.rst +++ b/akka-docs/rst/scala/testing.rst @@ -698,7 +698,7 @@ All these messages are logged at ``DEBUG`` level. To summarize, you can enable full logging of actor activities using this configuration fragment:: akka { - loglevel = DEBUG + loglevel = "DEBUG" actor { debug { receive = on