BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,386 Commits 13 Branches 260 Tags 1.1 GiB
58458a22f7
Commit Graph

142 Commits

Author SHA1 Message Date
Richard Alam
9893e352be Add more akka fsesl logs 
- add more logs to trace messages
 - add FS status check by sending ESL message to FS
 2019-09-13 10:54:56 -07:00
Richard Alam
4d42a74ea8 Add more logging 
- FreeSWITCH core dumped and akka-fsesl managed to reconnect. However, commands (mute, unmute, record, etc.) to FS are not reaching FS.
   But events (user joined, left, talking) from FS are received by akka-fsesl. Can't determine where the commands are falling off. These
   extra logging hopefully helps us narrow down if this happens again.

   I wasn't able to reproduce the issue when stopping and restarting FS. Akka-fsesl reconnects and command/events are flowing in both
   directions.
 2019-09-06 11:25:04 -07:00
Richard Alam
8cb00f457a - track FS caller using UUID so we can find when the channel was created and destroyed. 
This will help us hunt an issue where a channel gets stuck in a voice conference.
 2019-05-30 12:07:32 -07:00
Fred Dixon
1383e741cc
Merge pull request #7464 from ritzalam/fix-deserialization-error-callingwith 
- fix issue where akka-apps cannot deserialize the message because of…
 2019-05-26 12:09:04 -04:00
Richard Alam
df55ff262d - check if we have successfully ejected all users from the voice conference. 2019-05-24 20:24:00 -07:00
Richard Alam
75fc1e12b5 - fix issue where akka-apps cannot deserialize the message bcause of the null field. 2019-05-17 13:53:42 -07:00
Richard Alam
bf7898225b - minor cleanup 2019-04-30 12:30:59 -07:00
Richard Alam
17b8229afc - add redis password to fsesl 2019-04-05 11:35:05 -07:00
Richard Alam
8d4122cece - enable scalariforn for fsesl-akka 2019-03-27 13:33:22 -07:00
Ghazi Triki
78f5b2715d Improve akka-bbb-fsesl packaging. 2018-12-14 15:15:19 +01:00
Richard Alam
3f9dc6655a - minimize logging of redis connection 2018-12-11 14:06:09 -08:00
Richard Alam
c69fb9d585 - try to fix logging for akka fsesl 2018-12-11 13:45:45 -08:00
Ghazi Triki
5a9f74c88d Fix akka applications packaging configuration. 2018-12-10 19:10:46 +01:00
Ghazi Triki
fd959f9e14 Remove rediscala library and replace it by a lettuce implementation. 2018-12-05 20:21:06 +01:00
Ghazi Triki
fc4028d6de Redis refactoring : remove duplicate classes, factorisation and build configuration update. 2018-11-09 20:19:46 +01:00
Richard Alam
cc6f88d020 - my IntelliJ IDE seems to format differently with Ghazi's 
- fix screenshare redis connection error
 - fix bbb-web create meeting exception when second user joins
 2018-09-13 13:08:49 -07:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Richard Alam
b352ee2c95 - change log timestamp format so they are all the same 2018-05-15 10:50:40 -07:00
Richard Alam
c14a946041 - generate recording path in akka-apps for audio 2017-10-26 14:07:22 -07:00
Richard Alam
e01692c40b - send voice conf started and destroyed message 2017-10-19 17:18:50 -07:00
Richard Alam
33e1cb0b4f - indicate thru the userId that a user is calling through the phone. 2017-09-01 12:06:38 -07:00
Richard Alam
7956b561d2 - remove some printlns to minimize noise 2017-08-11 11:22:26 -07:00
Richard Alam
f2c7826772 - removing old pubsub 2017-07-12 11:52:46 -07:00
Richard Alam
d48f46c5e7 - try renaming deskshare to screenshare 2017-07-12 10:50:27 -07:00
Richard Alam
b04519ef0f FreeSWITCH webrtc screenshare 
- use webrtc screenshare using FS Verto
 - publish screenshare as rtmp to red5
 - flash clients view screenshare from red5 rtmp

 Fix mute/unmute/talking of user in voice conference
 2017-07-11 13:31:56 -07:00
Richard Alam
40d00282f5 - send deskshare messages from fsesl 2017-07-10 19:17:51 -07:00
Richard Alam
507cc69939 - fix compile issues 2017-07-07 14:51:25 -07:00
Richard Alam
c2c6b19e95 - group messages into it's own file 2017-06-28 07:23:49 -07:00
Richard Alam
ae4fc536b1 - fix use leaving voice conf 2017-06-24 06:47:19 -07:00
Richard Alam
d0343b40d2 - delay processing of pre-uploaded presentation to make sure that meeting has been created before 
presentation conversion has completed.
 2017-06-19 13:04:07 -07:00
Ghazi Triki
c7c39989a3 Added all breakout rooms events handlers in akka-bbb-apps project. 2017-06-19 16:57:36 +01:00
Richard Alam
b192327d7e - put back old voice conf message as duplicate so we can have a working client 2017-06-12 14:24:23 -07:00
Richard Alam
35b449b199 - create new status models 2017-06-10 11:11:22 -07:00
Richard Alam
e69b451a7b - cleanup 2017-06-09 13:30:52 -07:00
Richard Alam
4727eb8e8e - send messages from fs to akka apps 2017-06-09 11:04:17 -07:00
Richard Alam
1ccf71cad7 - add new voice conf messages 2017-06-08 17:55:27 -07:00
Ghazi Triki
08ff58f2b4 Fix akka-bbb-fsesl build.sbt and upgrade scala to 2.12.2 and akka to 2.5.1 2017-06-01 15:00:32 +01:00
Richard Alam
467598ffd2 - turn off keep alive message 2017-05-23 17:36:05 -07:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
5ba3405941 - remove defunct connection when client auto-reconnects. 2016-10-20 15:08:58 +00:00
Ghazi Triki
1d34bda5c2 Force audio profile in freeswitch transfer command. 2016-09-21 21:10:44 +01:00
perroned
0e3096d00d Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 2016-08-05 18:45:59 +00:00
Richard Alam
8e9b16776c Joining voice conf of breakout room 
A moderator should be able to listen-in on the breakout room. During a previous merge, the
 handler of the transfer message in FSESL was accidentally removed. The user isn't able to
 the breakout room's voice conference anymore.
 2016-08-05 13:58:07 +00:00
Anton Georgiev
2ae55432fd deskshare transition to webrtc screenshare changes 2016-07-29 16:16:55 +00:00
Anton Georgiev
01e0c99c58 subscribe for -DESKSHARE in meeting, adjust for liveMeeting 2016-07-20 21:39:36 +00:00
Richard Alam
58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
 2016-05-16 11:35:36 -04:00
Richard Alam
7ae9b7b204 Merge branch 'merge-webrtc-ds' of https://github.com/antobinary/bigbluebutton into antobinary-merge-webrtc-ds 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ESLEventListener.java
	akka-bbb-fsesl/src/main/scala/org/bigbluebutton/freeswitch/VoiceConferenceService.scala
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2016-05-20 20:27:52 +00:00
David Feng
67c14f9056 This enable avatar to be display in other participants video window 2016-04-20 14:08:13 +08:00
Anton Georgiev
095680cd46 resolve import issues 2016-03-30 17:34:34 -04:00
Anton Georgiev
12d61d0ddc remove unused classes 2016-02-04 20:53:43 +00:00
Ghazi Triki
2fb347bc25 Refactored the way that conference transfer between the parent room and breakout room is requested. 2016-02-03 22:30:08 +01:00
Pedro Beschorner Marin
e9cc024e5e Added exception handlers to deskshare actors and refactored the akka ones 2016-02-03 18:41:49 +00:00
Anton Georgiev
21f2d7a788 limit -DESKSHARE to fsesl only, not akka-bbb-apps 2016-01-29 20:52:14 +00:00
Ghazi Triki
eb0243634f Make sure that TransferUsetToMeetingCommand is executed by freeswitch. 2016-01-28 21:28:12 +01:00
Ghazi Triki
2968f69939 Fixed conference transfer command syntax for getCommandArgs method. 2016-01-28 20:12:10 +01:00
Pedro Beschorner Marin
d74c571958 Akka actors now print and log the exceptions and are kept alive 2016-01-28 18:15:24 +00:00
Ghazi Triki
edef66357c Fixed TransferUserToVoiceConfRequestMessage properties names. 2016-01-28 19:11:43 +01:00
Ghazi Triki
cda1e800d2 Deleted non exisint class from import in RedisMessageReceiver.java 2016-01-28 15:04:46 +01:00
Anton Georgiev
08d6ee36f9 recover videoWidth, videoHeight params 2016-01-27 21:42:10 +00:00
Ghazi Triki
053a432ce8 Enable a higher log level for akka-bbb-fsesl application. 2016-01-27 22:24:43 +01:00
Ghazi Triki
aedeb7050c Added missing class TransferUsetToMeetingCommand.java 2016-01-27 12:27:45 +01:00
Ghazi Triki
9b66cf30f9 Added transfer user from the parent voice conference to a selected breakout voice conference. 2016-01-27 12:00:32 +01:00
Anton Georgiev
7bedb7d6f7 missed some lines in recorderActor. also clean up 2016-01-26 20:23:50 +00:00
Anton Georgiev
0d9c2d1472 remove dependency on vh, vw. remove obsolete code. clean up 2016-01-26 18:53:26 +00:00
Anton Georgiev
c28bbce889 add data and clean up 2016-01-13 22:54:03 +00:00
Anton Georgiev
30462cd299 parse properly {}rtmp:// paths 2016-01-13 22:54:03 +00:00
Anton Georgiev
b5fafe25ca Removing recording code used in the past for recording to file via FS. obsolete as we now record in red5 2016-01-08 21:58:10 +00:00
Anton Georgiev
23a83ab6e9 destoy deskshare on FS if presenter leaves 2016-01-08 19:07:57 +00:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Anton Georgiev
f08cd5262e temp changes 2015-10-13 19:00:50 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Anton Georgiev
8b58671948 cleaning up 2015-09-10 15:24:08 +00:00
Anton Georgiev
eb57aa7da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging 2015-08-24 14:31:00 +00:00
Richard Alam
0e2e79fce8 - change redis pool config 
- reconnect to redis if connection to subscribe disconnected
 2015-08-23 04:56:30 -04:00
Anton Georgiev
1939dac06c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2015-08-21 20:15:37 +00:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Anton Georgiev
4db2ebb86e flag for ds started; cleaning up logs 2015-08-11 20:30:07 +00:00
Richard Alam
aa6191402c - change logging level as it was logging too much 2015-08-05 16:28:16 +00:00
Anton Georgiev
6560da3632 cleaning up 2015-07-10 15:33:27 +00:00
Anton Georgiev
9f5783c0b4 use real meetingId+timestamp broadcast path 2015-07-08 14:35:51 +00:00
Anton Georgiev
8de66fd448 ds rtmp displays in Flash client 2015-07-07 19:17:27 +00:00
Anton Georgiev
7192079977 send to BBB-Apps vh, vw, samplerate, fps, channels 2015-06-30 18:50:29 +00:00
Anton Georgiev
d7682f97b8 auto start/stop rtmp broadcast 2015-06-29 14:27:35 +00:00
Anton Georgiev
09e907d2ba auto start/stop video rec based on meeting isRecorded 2015-06-26 19:54:07 +00:00
Anton Georgiev
922ab7cc04 distinguish between rtmp broadcast and file record 2015-06-25 14:28:23 +00:00
Anton Georgiev
0e362e9762 FS deskshare serverside cont'd 2015-06-23 19:45:36 +00:00
Anton Georgiev
8b161e8217 record command; record messages 2015-06-19 20:38:54 +00:00
Richard Alam
35ebeb3bce - try to fix log location 2015-06-19 14:24:29 +00:00
Anton Georgiev
bdb56d4884 FS video share/view messages from fs to bbb-apps 2015-06-18 22:07:15 +00:00
Richard Alam
b178f7f077 - make bbb-fsesl use common messages 2015-06-10 18:30:31 +00:00
Richard Alam
bc214f3a32 - fix message name 2015-06-10 18:30:05 +00:00
Richard Alam
24b957e9e3 - rename to reflect this is our esl client to FS 2015-06-09 19:03:02 +00:00