From 3c3610d9cc12de16131aa611800d43e77c925551 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=27Morty=27=20Str=C3=BCbe?= Date: Wed, 28 Mar 2012 10:55:01 +0200 Subject: [PATCH] Allow setting a log4j config file --- tools/cooja/java/se/sics/cooja/GUI.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/tools/cooja/java/se/sics/cooja/GUI.java b/tools/cooja/java/se/sics/cooja/GUI.java index 3d2227f8e..ac1369075 100644 --- a/tools/cooja/java/se/sics/cooja/GUI.java +++ b/tools/cooja/java/se/sics/cooja/GUI.java @@ -2943,10 +2943,24 @@ public class GUI extends Observable { * null */ public static void main(String[] args) { - + String logConfigFile = null; + for (String element : args) { + if (element.startsWith("-log4j=")) { + String arg = element.substring("-log4j=".length()); + logConfigFile = arg; + } + } + try { // Configure logger - if ((new File(LOG_CONFIG_FILE)).exists()) { + if ( logConfigFile != null){ + if(new File(logConfigFile).exists()) { + DOMConfigurator.configure(logConfigFile); + } else { + System.err.println("Failed to open " + logConfigFile); + System.exit(1); + } + } else if ((new File(LOG_CONFIG_FILE)).exists()) { DOMConfigurator.configure(LOG_CONFIG_FILE); } else { // Used when starting from jar