diff --git a/akka-docs/rst/java/code/jdocs/actor/TypedActorDocTest.java b/akka-docs/rst/java/code/jdocs/actor/TypedActorDocTest.java index fa2eaae1ba..9da2c374e1 100644 --- a/akka-docs/rst/java/code/jdocs/actor/TypedActorDocTest.java +++ b/akka-docs/rst/java/code/jdocs/actor/TypedActorDocTest.java @@ -4,7 +4,6 @@ package jdocs.actor; //#imports - import akka.actor.TypedActor; import akka.actor.*; import akka.japi.*; @@ -25,7 +24,6 @@ import akka.routing.RoundRobinGroup; import org.junit.Test; import static org.junit.Assert.assertEquals; -//#imports public class TypedActorDocTest extends AbstractJavaTest { Object someReference = null; ActorSystem system = null; @@ -198,7 +196,7 @@ public class TypedActorDocTest extends AbstractJavaTest { } } - //#typed-router-types-1 + //#typed-router-types interface HasName { String name(); } diff --git a/akka-docs/rst/java/code/jdocs/future/FutureDocTest.java b/akka-docs/rst/java/code/jdocs/future/FutureDocTest.java index 2c80fd5b68..60bb2ddaba 100644 --- a/akka-docs/rst/java/code/jdocs/future/FutureDocTest.java +++ b/akka-docs/rst/java/code/jdocs/future/FutureDocTest.java @@ -39,12 +39,9 @@ import static akka.dispatch.Futures.reduce; //#imports6 //#imports7 -//#imports7 - -//#imports8 import static akka.pattern.Patterns.after; import java.util.Arrays; -//#imports8 +//#imports7 import java.util.ArrayList; import java.util.List; diff --git a/akka-docs/rst/java/futures.rst b/akka-docs/rst/java/futures.rst index f9105480ea..59c64a2780 100644 --- a/akka-docs/rst/java/futures.rst +++ b/akka-docs/rst/java/futures.rst @@ -22,7 +22,7 @@ it will use its default dispatcher as the ``ExecutionContext``, or you can use t by the ``ExecutionContexts`` class to wrap ``Executors`` and ``ExecutorServices``, or even create your own. .. includecode:: code/jdocs/future/FutureDocTest.java - :include: imports1,imports7 + :include: imports1 .. includecode:: code/jdocs/future/FutureDocTest.java :include: diy-execution-context @@ -256,7 +256,7 @@ After ``akka.pattern.Patterns.after`` makes it easy to complete a ``Future`` with a value or exception after a timeout. .. includecode:: code/jdocs/future/FutureDocTest.java - :include: imports8 + :include: imports7 .. includecode:: code/jdocs/future/FutureDocTest.java :include: after diff --git a/akka-docs/rst/java/persistence.rst b/akka-docs/rst/java/persistence.rst index 624ad1381b..464beb538c 100644 --- a/akka-docs/rst/java/persistence.rst +++ b/akka-docs/rst/java/persistence.rst @@ -291,7 +291,7 @@ of the command for which this ``deferAsync`` handler was called. You can also call ``deferAsync`` with ``persist``. -.. includecode:: code/docs/persistence/LambdaPersistenceDocTest.java#defer-with-persist +.. includecode:: code/jdocs/persistence/LambdaPersistenceDocTest.java#defer-with-persist .. warning:: The callback will not be invoked if the actor is restarted (or stopped) in between the call to diff --git a/akka-docs/rst/java/testing.rst b/akka-docs/rst/java/testing.rst index 559015a0e2..bf155fe623 100644 --- a/akka-docs/rst/java/testing.rst +++ b/akka-docs/rst/java/testing.rst @@ -249,7 +249,7 @@ with message flows: * :meth:`public List receiveWhile(Duration max, Duration idle, Int messages, Function f)` - .. includecode:: code/docs/testkit/TestKitDocTest.java#test-receivewhile-full + .. includecode:: code/jdocs/testkit/TestKitDocTest.java#test-receivewhile-full Collect messages as long as diff --git a/akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala b/akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala index f70da10bed..3641fcea30 100644 --- a/akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala +++ b/akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala @@ -3,6 +3,7 @@ */ package docs.actor +//#imports import java.lang.String.{ valueOf => println } import akka.actor.{ ActorContext, ActorRef, TypedActor, TypedProps } @@ -11,10 +12,10 @@ import akka.testkit._ import scala.concurrent.{ Future, Await } import scala.concurrent.duration._ +//#imports //Mr funny man avoids printing to stdout AND keeping docs alright import java.lang.String.{ valueOf => println } -import akka.actor.ActorRef //#typed-actor-iface trait Squarer { diff --git a/akka-docs/rst/scala/logging.rst b/akka-docs/rst/scala/logging.rst index 16a20e61d3..62c51d8776 100644 --- a/akka-docs/rst/scala/logging.rst +++ b/akka-docs/rst/scala/logging.rst @@ -5,10 +5,10 @@ ################# Logging in Akka is not tied to a specific logging backend. By default -log messages are printed to STDOUT, but you can plug-in a SLF4J logger or +log messages are printed to STDOUT, but you can plug-in a SLF4J logger or your own logger. Logging is performed asynchronously to ensure that logging has minimal performance impact. Logging generally means IO and locks, -which can slow down the operations of your code if it was performed +which can slow down the operations of your code if it was performed synchronously. How to Log @@ -76,7 +76,7 @@ to the :ref:`event-stream-scala`. Auxiliary logging options ------------------------- -Akka has a few configuration options for very low level debugging. These make more sense in development than in production. +Akka has a few configuration options for very low level debugging. These make more sense in development than in production. You almost definitely need to have logging set to DEBUG to use any of the options below: @@ -269,17 +269,17 @@ Loggers ======= Logging is performed asynchronously through an event bus. Log events are processed by an event handler actor -that receives the log events in the same order they were emitted. +that receives the log events in the same order they were emitted. .. note:: The event handler actor does not have a bounded inbox and is run on the default dispatcher. This means that logging extreme amounts of data may affect your application badly. This can be somewhat mitigated by -using an async logging backend though. (See :ref:`slf4j-directly-scala`) + using an async logging backend though. (See :ref:`slf4j-directly-scala`) -You can configure which event handlers are created at system start-up and listen to logging events. That is done using the +You can configure which event handlers are created at system start-up and listen to logging events. That is done using the ``loggers`` element in the :ref:`configuration`. -Here you can also define the log level. More fine grained filtering based on the log source -can be implemented in a custom ``LoggingFilter``, which can be defined in the ``logging-filter`` +Here you can also define the log level. More fine grained filtering based on the log source +can be implemented in a custom ``LoggingFilter``, which can be defined in the ``logging-filter`` configuration property. .. code-block:: ruby @@ -306,7 +306,7 @@ Logging to stdout during startup and shutdown When the actor system is starting up and shutting down the configured ``loggers`` are not used. Instead log messages are printed to stdout (System.out). The default log level for this -stdout logger is ``WARNING`` and it can be silenced completely by setting +stdout logger is ``WARNING`` and it can be silenced completely by setting ``akka.stdout-loglevel=OFF``. .. _slf4j-scala: @@ -480,13 +480,13 @@ some malicious activity and mark them with a ``SECURITY`` tag, and in your appen trigger emails and other notifications immediately. Markers are available through the LoggingAdapters, when obtained via ``Logging.withMarker``. -The first argument passed into all log calls then should be a ``akka.event.LogMarker``. +The first argument passed into all log calls then should be a ``akka.event.LogMarker``. The slf4j bridge provided by akka in ``akka-slf4j`` will automatically pick up this marker value and make it available to SLF4J. For example you could use it like this:: %date{ISO8601} [%marker][%level] [%msg]%n - + A more advanced (including most Akka added information) example pattern would be:: %date{ISO8601} level=[%level] marker=[%marker] logger=[%logger] akkaSource=[%X{akkaSource}] sourceActorSystem=[%X{sourceActorSystem}] sourceThread=[%X{sourceThread}] mdc=[ticket-#%X{ticketNumber}: %X{ticketDesc}] - msg=[%msg]%n----%n @@ -500,7 +500,7 @@ Akka includes a logger for `java.util.logging