Author: tfischer Date: Mon Oct 26 01:59:04 2015 New Revision: 1710501 URL: http://svn.apache.org/viewvc?rev=1710501&view=rev Log: TORQUE-337 do not use internal log4j configuration file if external log4j configuration is set via system property
Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java Modified: db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java?rev=1710501&r1=1710500&r2=1710501&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java (original) +++ db/torque/torque4/trunk/torque-generator/src/main/java/org/apache/torque/generator/control/Controller.java Mon Oct 26 01:59:04 2015 @@ -152,6 +152,13 @@ public class Controller */ protected void initLogging() { + String log4jConfiguration = System.getProperty("log4j.configuration"); + if (log4jConfiguration != null) + { + log.info("Using external log4j configuration from " + log4jConfiguration); + return; + } + final InputStream log4jStream = Controller.class.getClassLoader().getResourceAsStream( "org/apache/torque/generator/log4j.properties"); --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org