- add more logging on why local UDP port for audio is hanging around

kirill-scherba · Dec 1, 2010 · e5f1536 · e5f1536
1 parent 75b6f10
commit e5f1536
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/AudioBroadcastStream.java
@@ -140,11 +140,11 @@ public IScope getScope() {
 	}
 
 	public void start() {
-		log.trace("start()");
+		log.debug("Starting AudioBroadcastStream()");
 	}
 
 	public void stop() {
-		log.trace("stop");
+		log.debug("Stopping AudioBroadcastStream");
 	}
 
 	public void onOOBControlMessage(IMessageComponent source, IPipe pipe, OOBControlMessage oobCtrlMsg) {

diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/CallStream.java
@@ -90,6 +90,7 @@ public void stopTalkStream(IBroadcastStream broadcastStream, IScope scope) {
     }
 
     public void stop() {
+    	log.debug("Stopping call stream");
         userListenStream.stop();
     }
 

diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/red5/media/SipToFlashAudioStream.java
@@ -85,11 +85,14 @@ public void addListenStreamObserver(StreamObserver o) {
 	}
 
 	public void stop() {
-		processAudioData = false;
-		rtpStreamReceiver.stop();
+		log.debug("Stopping stream for {}", listenStreamName);
+		processAudioData = false;		
+		rtpStreamReceiver.stop();
+		log.debug("Stopped RTP Stream Receiver for {}", listenStreamName);
 		audioBroadcastStream.stop();
+		log.debug("Stopped audioBroadcastStream for {}", listenStreamName);
 	    audioBroadcastStream.close();
-	    log.debug("stopping and closing stream {}", listenStreamName);
+	    log.debug("Closed audioBroadcastStream for {}", listenStreamName);
 	}
 
 	public void start() {

diff --git a/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java b/bbb-voice/src/main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java
@@ -213,6 +213,8 @@ private void closeVoiceStreams() {
         if (callStream != null) {
         	callStream.stop();
         	callStream = null;
+        } else {
+        	log.debug("Can't shutdown voice stream. callstream is NULL");
         }
     }
 
@@ -327,7 +329,12 @@ private void notifyListenersOfOnCallClosed() {
     }
 
     private void cleanup() {
-    	localSocket.close();
+    	log.debug("Closing local audio port {}", localSocket.getLocalPort());
+    	if (localSocket != null) {
+    		localSocket.close();
+    	} else {
+    		log.debug("Trying to close un-allocated port {}", localSocket.getLocalPort());
+    	}
     }
 
     /** Callback function called when arriving a BYE request */
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         public void stop() {
+        	log.debug("Stopping call stream");
             userListenStream.stop();
         }
@@ Expand Down @@