mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add log4j.properties to p2pproxy.jar

Browse source 
git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@355 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
This commit is contained in:
jehan 2009-03-22 16:56:58 +00:00
parent 2f6ce2d647
commit 17ae75fa55
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
p2pproxy/build.xml
View file

@ -186,8 +186,8 @@
<attribute name="Main-Class" value="org.linphone.p2pproxy.core.P2pProxyMain"/>
<attribute name="Class-Path" value="log4j.jar bcprov-jdk14.jar javax.servlet.jar org.mortbay.jetty.jar sip.jar"/>
</manifest>
<!-- put manifest -->
<jar jarfile="${dist.dir}/p2pproxy.jar" compress="false" keepcompression="true" update="true" manifest="antbuild/META-INF/MANIFEST.MF"/>
<!-- put manifest + log4j.properties -->
<jar jarfile="${dist.dir}/p2pproxy.jar" compress="false" keepcompression="true" update="true" manifest="antbuild/META-INF/MANIFEST.MF" basedir="." includes="log4j.properties"/>
<zip destfile="antbuild/p2pproxy_${version}.zip" basedir="antbuild/dist" />

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

@ -25,6 +25,8 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
import java.net.URI;
import java.net.URL;
@ -47,7 +49,7 @@ import org.zoolu.sip.provider.SipStack;
import org.linphone.p2pproxy.launcher.P2pProxylauncherConstants;
public class P2pProxyMain implements P2pProxyMainMBean {
private final static Logger mLog = Logger.getLogger(P2pProxyMain.class);
private static Logger mLog = null;
private static JxtaNetworkManager mJxtaNetworkManager;
private static ServiceProvider mServiceProvider;
private static P2pProxyManagement mP2pProxyManagement;
@ -321,7 +323,7 @@ public void loadTraceConfigFile() throws P2pProxyException {
}
public static void staticLoadTraceConfigFile() throws P2pProxyException {
try {
URL lLog4jFile = null;
InputStream lLog4jStream = null;
String lSearchDir;
//search build dir
lSearchDir = System.getProperty("org.linphone.p2pproxy.build.dir");
@ -333,24 +335,26 @@ public static void staticLoadTraceConfigFile() throws P2pProxyException {
lSearchDir=".";
lFile = new File(lSearchDir+"/log4j.properties");
if (lFile.exists() == false) {
lLog4jFile = Thread.currentThread().getContextClassLoader().getResource("log4j.properties");
lLog4jStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("log4j.properties");
}
}
}
if (lLog4jFile == null) {
lLog4jFile = lFile.toURL();
if (lLog4jStream == null) {
lLog4jStream = new FileInputStream(lFile);
}
PropertyConfigurator.configure(lLog4jFile);
Properties llog4Properties = new Properties();
llog4Properties.load(lLog4jStream);
PropertyConfigurator.configure(llog4Properties);
mLog = Logger.getLogger(P2pProxyMain.class);
// read java.util.logging properties
Properties lLogginProperties = new Properties();
lLogginProperties.load(new FileInputStream(new File(lLog4jFile.toURI())));
lLogginProperties.setProperty("java.util.logging.FileHandler.pattern",System.getProperty("org.linphone.p2pproxy.home")+"/logs/p2pproxy.log");
llog4Properties.setProperty("java.util.logging.FileHandler.pattern",System.getProperty("org.linphone.p2pproxy.home")+"/logs/p2pproxy.log");
File lLogConfigFile = new File(mConfigHomeDir.concat("log4j.properties")+".tmp");
if (lLogConfigFile.exists() == false) {
lLogConfigFile.createNewFile();
}
lLogginProperties.store(new FileOutputStream(lLogConfigFile), "tmp");
llog4Properties.store(new FileOutputStream(lLogConfigFile), "tmp");
System.setProperty("java.util.logging.config.file",lLogConfigFile.getAbsolutePath());
java.util.logging.LogManager.getLogManager().readConfiguration();
} catch (Exception e) {