diff --git a/docs/content/Logging.md b/docs/content/Logging.md index d949aa7858d..6733995a097 100644 --- a/docs/content/Logging.md +++ b/docs/content/Logging.md @@ -6,34 +6,31 @@ Logging Druid nodes will emit logs that are useful for debugging to the console. Druid nodes also emit periodic metrics about their state. For more about metrics, see [Configuration](Configuration.html). Metric logs are printed to the console by default, and can be disabled with `-Ddruid.emitter.logging.logLevel=debug`. -Druid uses [log4j](http://logging.apache.org/log4j/2.x/) for logging, and console logs can be configured by adding a log4j.xml file. Add this xml file to your classpath if you want to override default Druid log configuration. +Druid uses [log4j2](http://logging.apache.org/log4j/2.x/) for logging. Logging can be configured with a log4j2.xml file. Add the path to the directory containing the log4j2.xml file (eg a config dir) to your classpath if you want to override default Druid log configuration. Note that this directory should be earlier in the classpath than the druid jars. The easiest way to do this is to prefix the classpath with the config dir. For example, if the log4j2.xml file is in config/_common: -An example log4j.xml file is shown below: +```bash +java -Xmx512m -Duser.timezone=UTC -Dfile.encoding=UTF-8 \ + -Ddruid.realtime.specFile=examples/indexing/wikipedia.spec \ + -classpath "config/_common:config/realtime:lib/*" \ + io.druid.cli.Main server realtime +``` + +Note the "-classpath" in this example has the config dir before the jars under lib/*. + +An example log4j2.xml ships with Druid under config/_common/log4j2.xml, and a sample file is also shown below: ``` - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + ``` \ No newline at end of file diff --git a/docs/content/Tutorial:-All-About-Queries.md b/docs/content/Tutorial:-All-About-Queries.md index 12d4af82604..80a0786fdd8 100644 --- a/docs/content/Tutorial:-All-About-Queries.md +++ b/docs/content/Tutorial:-All-About-Queries.md @@ -19,19 +19,19 @@ Note: If Zookeeper and metadata storage aren't running, you'll have to start the To start a Coordinator node: ```bash -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*:config/_common:config/coordinator io.druid.cli.Main server coordinator +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/coordinator:lib/* io.druid.cli.Main server coordinator ``` To start a Historical node: ```bash -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*:config/_common:config/historical io.druid.cli.Main server historical +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/historical:lib/* io.druid.cli.Main server historical ``` To start a Broker node: ```bash -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*:config/_common:config/broker io.druid.cli.Main server broker +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/broker:lib/* io.druid.cli.Main server broker ``` Querying Your Data diff --git a/docs/content/Tutorial:-Loading-Batch-Data.md b/docs/content/Tutorial:-Loading-Batch-Data.md index 7b0a6b1a517..0425c1c4d1d 100644 --- a/docs/content/Tutorial:-Loading-Batch-Data.md +++ b/docs/content/Tutorial:-Loading-Batch-Data.md @@ -66,19 +66,19 @@ Note: If Zookeeper and MySQL aren't running, you'll have to start them again as To start the Indexing Service: ```bash -java -Xmx2g -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*::config/_common:config/overlord io.druid.cli.Main server overlord +java -Xmx2g -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/overlord:lib/*: io.druid.cli.Main server overlord ``` To start the Coordinator Node: ```bash -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*:config/_common:config/coordinator io.druid.cli.Main server coordinator +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/coordinator:lib/* io.druid.cli.Main server coordinator ``` To start the Historical Node: ```bash -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*:config/_common:config/historical io.druid.cli.Main server historical +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/historical:lib/* io.druid.cli.Main server historical ``` #### Index the Data diff --git a/docs/content/Tutorial:-The-Druid-Cluster.md b/docs/content/Tutorial:-The-Druid-Cluster.md index 5b5c264b36a..57dbba459ec 100644 --- a/docs/content/Tutorial:-The-Druid-Cluster.md +++ b/docs/content/Tutorial:-The-Druid-Cluster.md @@ -169,7 +169,7 @@ druid.coordinator.startDelay=PT70s To start the coordinator node: ```bash -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*:config/_common:config/coordinator io.druid.cli.Main server coordinator +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/coordinator:lib/* io.druid.cli.Main server coordinator ``` Note: we will be running a single historical node in these examples, so you may see some warnings about not being able to replicate segments. These can be safely ignored, but in production, you should always replicate segments across multiple historical nodes. @@ -204,7 +204,7 @@ druid.server.maxSize=10000000000 To start the historical node: ```bash -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*:config/_common:config/historical io.druid.cli.Main server historical +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/historical:lib/* io.druid.cli.Main server historical ``` #### Start a Broker Node @@ -236,7 +236,7 @@ druid.processing.numThreads=1 To start the broker node: ```bash -java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath lib/*:config/_common:config/broker io.druid.cli.Main server broker +java -Xmx256m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -classpath config/_common:config/broker:lib/* io.druid.cli.Main server broker ``` #### Start a Realtime Node @@ -282,7 +282,7 @@ Now we should be handing off segments every 6 minutes or so. To start the realtime node that was used in our first tutorial, you simply have to issue: ``` -java -Xmx512m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Ddruid.realtime.specFile=examples/wikipedia/wikipedia_realtime.spec -classpath lib/*:config/_common:config/realtime io.druid.cli.Main server realtime +java -Xmx512m -Duser.timezone=UTC -Dfile.encoding=UTF-8 -Ddruid.realtime.specFile=examples/wikipedia/wikipedia_realtime.spec -classpath config/_common:config/realtime:lib/* io.druid.cli.Main server realtime ``` The configurations are located in `config/realtime/runtime.properties` and should contain the following: diff --git a/examples/bin/run_example_server.sh b/examples/bin/run_example_server.sh index 07a47d88f30..bbbe26566b7 100755 --- a/examples/bin/run_example_server.sh +++ b/examples/bin/run_example_server.sh @@ -55,11 +55,11 @@ JAVA_ARGS="${JAVA_ARGS} -Ddruid.realtime.specFile=${SPEC_FILE}" DRUID_CP=${EXAMPLE_LOC} #For a pull -DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/../config/realtime +DRUID_CP=${SCRIPT_DIR}/../config/realtime:${DRUID_CP} #For the kit -DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/lib/* DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/config/_common DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/config/realtime +DRUID_CP=${DRUID_CP}:${SCRIPT_DIR}/lib/* echo "Running command:" diff --git a/examples/config/_common/log4j2.xml b/examples/config/_common/log4j2.xml new file mode 100644 index 00000000000..78e9768e4d0 --- /dev/null +++ b/examples/config/_common/log4j2.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + diff --git a/processing/src/main/java/io/druid/guice/PropertiesModule.java b/processing/src/main/java/io/druid/guice/PropertiesModule.java index daac272ed15..5f6ae213d28 100644 --- a/processing/src/main/java/io/druid/guice/PropertiesModule.java +++ b/processing/src/main/java/io/druid/guice/PropertiesModule.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.druid.guice;; +package io.druid.guice; import com.google.common.base.Charsets; import com.google.common.base.Throwables;