BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #516 from bigbluebutton/remove-collector-actor

Browse Source 
- remote CollectorActor as we don't use it. Found that sometimes it's s...
This commit is contained in:
Richard Alam 2015-02-17 19:12:12 -05:00
commit 23573f528c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonGateway.scala
View File

@ -5,14 +5,12 @@ import java.util.concurrent.CountDownLatch
import scala.actors.Actor import scala.actors.Actor
import scala.actors.Actor._ import scala.actors.Actor._
class BigBlueButtonGateway(outGW: MessageOutGateway, collGW: CollectorGateway) { class BigBlueButtonGateway(outGW: MessageOutGateway) {
private val bbbActor = new BigBlueButtonActor(outGW) private val bbbActor = new BigBlueButtonActor(outGW)
bbbActor.start bbbActor.start
def accept(msg: InMessage):Unit = { def accept(msg: InMessage):Unit = {
collGW.collectInMessage(msg)
bbbActor ! msg bbbActor ! msg
} }

4
bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
View File

@ -84,7 +84,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<bean id="bbbGW" class="org.bigbluebutton.core.BigBlueButtonGateway"> <bean id="bbbGW" class="org.bigbluebutton.core.BigBlueButtonGateway">
<constructor-arg index="0" ref="outMsgGW"/> <constructor-arg index="0" ref="outMsgGW"/>
<constructor-arg index="1" ref="collectorGW"/>
</bean> </bean>
<bean id="collectorGW" class="org.bigbluebutton.core.CollectorGateway"> <bean id="collectorGW" class="org.bigbluebutton.core.CollectorGateway">
@ -120,8 +119,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<ref bean="chatRedisRecorder"/> <ref bean="chatRedisRecorder"/>
<ref bean="chatRedisPublisher"/> <ref bean="chatRedisPublisher"/>
<ref bean="fsConfService"/> <ref bean="fsConfService"/>
<ref bean="whiteboardEventRedisPublisher"/> <ref bean="whiteboardEventRedisPublisher"/>
<ref bean="collectorGW"/>
</set> </set>
</property> </property>
</bean> </bean>