From 06fafa3ed9b9336634a30b438053410d62e3af9b Mon Sep 17 00:00:00 2001 From: javanna Date: Wed, 19 Nov 2014 11:24:23 +0100 Subject: [PATCH] [DOCS] document that we support loading multiple logging conf files --- docs/reference/setup/configuration.asciidoc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/reference/setup/configuration.asciidoc b/docs/reference/setup/configuration.asciidoc index 809d7943ed4..a87ac37e1dd 100644 --- a/docs/reference/setup/configuration.asciidoc +++ b/docs/reference/setup/configuration.asciidoc @@ -312,12 +312,14 @@ log4j configuration by using http://www.yaml.org/[YAML] to configure it, and the logging configuration file is `config/logging.yml`. The http://en.wikipedia.org/wiki/JSON[JSON] and http://en.wikipedia.org/wiki/.properties[properties] formats are also -supported. The logger section contains the java packages and their -corresponding log level, where it is possible to omit the `org.elasticsearch` -prefix. The appender section contains the destinations for the logs. -Extensive information on how to customize logging and all the supported -appenders can be found on the -http://logging.apache.org/log4j/1.2/manual.html[log4j documentation]. +supported. Multiple configuration files can be loaded, in which case they will +get merged, as long as they start with the `logging.` prefix and end with one +of the supported suffixes (either `.yml`, `.yaml`, `.json` or `.properties`). +The logger section contains the java packages and their corresponding log +level, where it is possible to omit the `org.elasticsearch` prefix. The +appender section contains the destinations for the logs. Extensive information +on how to customize logging and all the supported appenders can be found on +the http://logging.apache.org/log4j/1.2/manual.html[log4j documentation]. coming[1.5.0] Additional Appenders and other logging classes provided by http://logging.apache.org/log4j/extras/[log4j-extras] are also available,