Revision: 82
Author: [email protected]
Date: Sun Feb 17 20:38:26 2013
Log: Log levels are enchanced;
logback.xml is added to the classpath;
code clean up;
http://code.google.com/p/red5phone/source/detail?r=82
Modified:
/branches/red5sip/logback.xml
/branches/red5sip/red5sip.sh
/branches/red5sip/src/java/org/red5/codecs/g729/Util.java
/branches/red5sip/src/java/org/red5/sip/app/Main.java
/branches/red5sip/src/java/org/red5/sip/app/RTMPRoomClient.java
/branches/red5sip/src/java/org/red5/sip/app/RTPStream.java
/branches/red5sip/src/java/org/red5/sip/app/RTPStreamMultiplexingSender.java
/branches/red5sip/src/java/org/red5/sip/app/RTPStreamReceiver.java
/branches/red5sip/src/java/org/red5/sip/app/RTPStreamSender.java
/branches/red5sip/src/java/org/red5/sip/app/SIPAudioLauncher.java
/branches/red5sip/src/java/org/red5/sip/app/SdpUtils.java
/branches/red5sip/src/java/org/zoolu/sip/provider/SipParser.java
/branches/red5sip/src/java/org/zoolu/sip/provider/SipProvider.java
/branches/red5sip/src/java/org/zoolu/tools/Base64.java
/branches/red5sip/src/java/org/zoolu/tools/Configure.java
=======================================
--- /branches/red5sip/logback.xml Sun Feb 17 20:04:17 2013
+++ /branches/red5sip/logback.xml Sun Feb 17 20:38:26 2013
@@ -5,7 +5,7 @@
<pattern>%d{dd MMM HH:mm:ss} - [%-5p] %c{1}: %m%n</pattern>
</encoder>
<rollingPolicy
class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <maxIndex>2</maxIndex>
+ <maxIndex>10</maxIndex>
<FileNamePattern>${logs}/red5log.log.%i</FileNamePattern>
</rollingPolicy>
<triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
=======================================
--- /branches/red5sip/red5sip.sh Tue Feb 12 02:46:43 2013
+++ /branches/red5sip/red5sip.sh Sun Feb 17 20:38:26 2013
@@ -9,8 +9,7 @@
LIB_DIR=$RED5SIP_HOME/lib
LOGS_DIR=$RED5SIP_HOME/log
SETTINGS_FILE=$RED5SIP_HOME/settings.properties
-CLASSPATH=$(echo $LIB_DIR/*.jar | sed 's/ /:/g')
echo "Starting Red5SIP"
-exec $JAVA_HOME/bin/java -Dlogs=$LOGS_DIR -cp $CLASSPATH
org.red5.sip.app.Main $SETTINGS_FILE
+exec $JAVA_HOME/bin/java -Dlogs=$LOGS_DIR -cp ".:$LIB_DIR/*"
org.red5.sip.app.Main $SETTINGS_FILE
=======================================
--- /branches/red5sip/src/java/org/red5/codecs/g729/Util.java Thu Feb 14
08:34:08 2013
+++ /branches/red5sip/src/java/org/red5/codecs/g729/Util.java Sun Feb 17
20:38:26 2013
@@ -3,8 +3,12 @@
import java.io.IOException;
import java.io.OutputStream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class Util {
+ protected static Logger log = LoggerFactory.getLogger(Util.class);
/*-------------------------------------------------------------------*
* Function set zero() *
@@ -130,8 +134,7 @@
try {
fp.write(shortToBytes(sp16[i]));
} catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ log.error("IOException", e);
}
}
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/Main.java Thu Feb 14
08:34:08 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/Main.java Sun Feb 17
20:38:26 2013
@@ -12,7 +12,7 @@
try {
main.start();
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Exception", e);
}
Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
public void run() {
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/RTMPRoomClient.java Sun Feb
17 20:11:53 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/RTMPRoomClient.java Sun Feb
17 20:38:26 2013
@@ -11,6 +11,7 @@
import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.buffer.IoBuffer;
import org.apache.openmeetings.persistence.beans.room.Client;
+import org.red5.codecs.g729.Util;
import org.red5.io.utils.ObjectMap;
import org.red5.server.api.IScope;
import org.red5.server.api.event.IEvent;
@@ -109,9 +110,9 @@
}
});
} catch (NoSuchFieldException e) {
- e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
+ log.error("NoSuchFieldException", e);
} catch (IllegalAccessException e) {
- e.printStackTrace(); //To change body of catch statement use
File | Settings | File Templates.
+ log.error("NoSuchFieldException", e);
}
}
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/RTPStream.java Sun Feb 17
19:49:41 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/RTPStream.java Sun Feb 17
20:38:26 2013
@@ -10,7 +10,6 @@
protected static Logger log = LoggerFactory.getLogger(RTPStream.class);
- private int streamId;
private RTPStreamSender sender;
private long syncSource;
private long timestamp;
@@ -31,7 +30,6 @@
boolean asao_buffer_processed = false;
public RTPStream(int streamId, long syncSource, RTPStreamSender
sender) {
- this.streamId = streamId;
this.syncSource = syncSource;
this.sender = sender;
this.packetBuffer = new byte[
sender.sipCodec.getOutgoingEncodedFrameSize() +
RTPStreamSender.RTP_HEADER_SIZE ];
@@ -162,7 +160,7 @@
}
}
catch ( Exception e ) {
- e.printStackTrace();
+ log.error("Exception", e);
}
return finalCopySize;
=======================================
---
/branches/red5sip/src/java/org/red5/sip/app/RTPStreamMultiplexingSender.java
Sun Feb 17 19:49:41 2013
+++
/branches/red5sip/src/java/org/red5/sip/app/RTPStreamMultiplexingSender.java
Sun Feb 17 20:38:26 2013
@@ -198,7 +198,7 @@
rtpSocket = new RtpSocket(src_socket,
InetAddress.getByName(dest_addr), dest_port);
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Exception", e);
}
}
@@ -425,7 +425,7 @@
}
} catch (Exception e) {
- e.printStackTrace();
+ log.error("Exception", e);
}
return finalCopySize;
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/RTPStreamReceiver.java Sun
Feb 17 19:49:41 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/RTPStreamReceiver.java Sun
Feb 17 20:38:26 2013
@@ -45,7 +45,7 @@
init( sipCodec, rtmpUser, socket );
}
catch ( Exception e ) {
- e.printStackTrace();
+ log.error("Exception", e);
}
}
@@ -151,7 +151,7 @@
catch ( Exception e ) {
running = false;
- e.printStackTrace();
+ log.error("Exception", e);
}
// Close RtpSocket and local DatagramSocket.
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/RTPStreamSender.java Sun
Feb 17 19:49:41 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/RTPStreamSender.java Sun
Feb 17 20:38:26 2013
@@ -149,7 +149,7 @@
rtpSocket = new RtpSocket( src_socket, InetAddress.getByName(
dest_addr ), dest_port );
}
catch ( Exception e ) {
- e.printStackTrace();
+ log.error("Exception", e);
}
}
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/SIPAudioLauncher.java Sun
Feb 17 19:49:41 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/SIPAudioLauncher.java Sun
Feb 17 20:38:26 2013
@@ -48,7 +48,7 @@
}
catch ( Exception e ) {
printLog( "SIPAudioLauncher", "Exception " + e );
- e.printStackTrace();
+ log.error("Exception", e);
}
}
=======================================
--- /branches/red5sip/src/java/org/red5/sip/app/SdpUtils.java Sun Feb 17
19:49:41 2013
+++ /branches/red5sip/src/java/org/red5/sip/app/SdpUtils.java Sun Feb 17
20:38:26 2013
@@ -314,7 +314,7 @@
catch ( Exception exception ) {
printLog( "createInitialSdp", "Failure creating initial SDP: "
);
- exception.printStackTrace();
+ log.error("Exception", exception);
}
printLog( "createInitialSdp", "End..." );
@@ -465,7 +465,7 @@
catch ( Exception exception ) {
printLog( "makeMediaPayloadsNegotiation", "Failure creating
initial SDP: " );
- exception.printStackTrace();
+ log.error("Exception", exception);
}
printLog( "makeMediaPayloadsNegotiation", "End..." );
@@ -561,7 +561,7 @@
catch ( Exception exception ) {
printLog( "completeSdpNegotiation", "Failure creating initial
SDP: " );
- exception.printStackTrace();
+ log.error("Exception", exception);
}
printLog( "completeSdpNegotiation", "End..." );
@@ -662,7 +662,7 @@
catch ( Exception exception ) {
printLog( "makeAttributeNegotiation", "Failure creating
initial SDP: " );
- exception.printStackTrace();
+ log.error("Exception", exception);
}
printLog( "makeAttributeNegotiation", "End..." );
=======================================
--- /branches/red5sip/src/java/org/zoolu/sip/provider/SipParser.java Sun
Feb 17 19:49:41 2013
+++ /branches/red5sip/src/java/org/zoolu/sip/provider/SipParser.java Sun
Feb 17 20:38:26 2013
@@ -303,7 +303,11 @@
index=str.indexOf("GMT",index)+3;
return d;
}
- catch (Exception e) { e.printStackTrace(); index=str.length();
return null; }
+ catch (Exception e) {
+ log.error("Exception", e);
+ index=str.length();
+ return null;
+ }
}
=======================================
--- /branches/red5sip/src/java/org/zoolu/sip/provider/SipProvider.java Sun
Feb 17 19:49:41 2013
+++ /branches/red5sip/src/java/org/zoolu/sip/provider/SipProvider.java Sun
Feb 17 20:38:26 2013
@@ -296,7 +296,13 @@
if (host_port<=0) host_port=SipStack.default_port;
host_ipaddr=null;
if (ifaddr!=null && !ifaddr.equalsIgnoreCase(ALL_INTERFACES))
- { try { host_ipaddr=IpAddress.getByName(ifaddr); } catch
(IOException e) { e.printStackTrace(); host_ipaddr=null; }
+ {
+ try {
+ host_ipaddr=IpAddress.getByName(ifaddr);
+ } catch (IOException e) {
+ log.error("Exception", e);
+ host_ipaddr=null;
+ }
}
transport_protocols=protocols;
if (transport_protocols==null)
transport_protocols=SipStack.default_transport_protocols;
=======================================
--- /branches/red5sip/src/java/org/zoolu/tools/Base64.java Sun Feb 17
19:49:41 2013
+++ /branches/red5sip/src/java/org/zoolu/tools/Base64.java Sun Feb 17
20:38:26 2013
@@ -179,7 +179,9 @@
try {
strdecodificato = new String (decodificato,"ISO-8859-1");
}
- catch (Exception e) { e.printStackTrace();}
+ catch (Exception e) {
+ log.error("Exception", e);
+ }
log.debug("messaggio decodificato e: "+strdecodificato);
}
}
=======================================
--- /branches/red5sip/src/java/org/zoolu/tools/Configure.java Sun Feb 17
19:49:41 2013
+++ /branches/red5sip/src/java/org/zoolu/tools/Configure.java Sun Feb 17
20:38:26 2013
@@ -82,7 +82,10 @@
while (true)
{ String line=null;
- try { line=in.readLine(); } catch (Exception e) {
e.printStackTrace(); System.exit(0); }
+ try { line=in.readLine(); } catch (Exception e) {
+ log.error("Exception", e);
+ System.exit(0);
+ }
if (line==null) break;
if (!line.startsWith("#"))
