mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-25 23:28:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

take log4j.properties from the jar file (preliminary work)

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@350 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
jehan 2009-03-18 21:37:02 +00:00
parent 4464b5fe48
commit 6b0325c802
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
p2pproxy/src/org/linphone/p2pproxy/core/P2pProxyMain.java
View file

@ -321,7 +321,8 @@ public void loadTraceConfigFile() throws P2pProxyException {
}
public static void staticLoadTraceConfigFile() throws P2pProxyException {
try {
String lSearchDir;
URL lLog4jFile = null;
String lSearchDir;
//search build dir
lSearchDir = System.getProperty("org.linphone.p2pproxy.build.dir");
File lFile = new File(lSearchDir+"/log4j.properties");
@ -330,16 +331,27 @@ public static void staticLoadTraceConfigFile() throws P2pProxyException {
lFile = new File(lSearchDir+"/log4j.properties");
if (lFile.exists() == false) {
lSearchDir=".";
lFile = new File(lSearchDir+"/log4j.properties");
if (lFile.exists() == false) {
lLog4jFile = Thread.currentThread().getContextClassLoader().getResource("log4j.properties");
}
}
}
String lLog4jFile= lSearchDir+"/log4j.properties";
PropertyConfigurator.configureAndWatch(lLog4jFile);
if (lLog4jFile == null) {
lLog4jFile = lFile.toURL();
}
PropertyConfigurator.configure(lLog4jFile);
// read java.util.logging properties
Properties lLogginProperties = new Properties();
lLogginProperties.load(new FileInputStream(lLog4jFile));
lLogginProperties.load(new FileInputStream(new File(lLog4jFile.toURI())));
lLogginProperties.setProperty("java.util.logging.FileHandler.pattern",System.getProperty("org.linphone.p2pproxy.home")+"/logs/p2pproxy.log");
lLogginProperties.store(new FileOutputStream(lLog4jFile+".tmp"), "tmp");
System.setProperty("java.util.logging.config.file",lLog4jFile+".tmp");
File lLogConfigFile = new File(mConfigHomeDir.concat("log4j.properties")+".tmp");
if (lLogConfigFile.exists() == false) {
lLogConfigFile.createNewFile();
}
lLogginProperties.store(new FileOutputStream(lLogConfigFile), "tmp");
System.setProperty("java.util.logging.config.file",lLogConfigFile.getAbsolutePath());
java.util.logging.LogManager.getLogManager().readConfiguration();
} catch (Exception e) {
throw new P2pProxyException("enable to load traces",e);