Anton Georgiev
fc93b5a91c
correctly add chat message without flattening
2020-12-17 22:02:38 +00:00
Anton Georgiev
c1ffced27d
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into develop
2020-12-17 21:14:29 +00:00
Anton Georgiev
8b65f9e15b
Set bbb-html5 loadbalancing to be round robin
2020-12-15 01:55:57 +00:00
Anton Georgiev
9239d515a5
dispatch whiteboard events to html5 redis channel only
2020-12-12 01:45:38 +00:00
Anton Georgiev
0be8773e4c
Loadbalance bbb-html5 in bbb-web based on CPU
2020-12-11 21:36:06 +00:00
Joao Siebel
5b0d6c59e6
Code clean up
2020-12-10 14:05:22 -03:00
Joao Siebel
bf5a45d303
Create Metrics class
2020-12-10 12:07:06 -03:00
Joao Siebel
d6a1f1a454
Change processing start time
2020-12-09 15:06:25 -03:00
Joao Siebel
029c42c1e5
Add processing time metrics
2020-12-09 14:24:41 -03:00
Joao Siebel
b532673691
Move metric function
2020-12-08 10:49:07 -03:00
Joao Siebel
0ec8576209
Fix multiple write listeners
2020-12-08 09:37:59 -03:00
Joao Siebel
829591ffc7
Implement redis metrics object
2020-12-07 17:57:33 -03:00
Anton Georgiev
244a239810
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge
2020-12-01 20:02:50 +00:00
Anton Georgiev
f34826718d
include instanceId in resources url
2020-11-30 16:09:35 +00:00
Anton Georgiev
0c7ae7537b
Only display Redis: MeetingMessageQueue if size > 100
2020-11-25 10:32:45 -05:00
Anton Georgiev
3faabd1821
Merge 2.2.29 and 2.2.30 into 2.3.x
2020-11-24 15:13:09 +00:00
Anton Georgiev
39257aa2d8
parse instanceId as int; develop on port 4000
2020-11-19 15:31:24 +00:00
Anton Georgiev
23f2df11d5
code changes to allow for meetings' redis events to be processed on different html5 nodejs pids
2020-11-18 20:34:02 +00:00
Anton Georgiev
a8dc7a0bff
Simplified redis debug and placed behind check
2020-11-12 21:03:57 -05:00
Anton Georgiev
4a38524778
Logging with JSON stringify was leading to crashes. Reverting, need to investigate further
2020-05-24 08:22:10 -04:00
Anton Georgiev
e7917994d5
add banUser field in EjectUserFromMeetingCmdMsgBody
2020-05-22 10:45:28 -04:00
Richard Alam
62e5e599d3
- add timestamp field to messages sent from html5 server
2019-10-18 09:50:38 -07:00
Chad Pilkey
cef913294f
stop silencing message exceptions in html5 server
2019-06-28 18:51:26 +00:00
Anton Georgiev
aba6f72202
Handle both null and undefined password
2019-05-15 14:50:28 -04:00
Anton Georgiev
7937a779a6
Merge pull request #7231 from BobakOftadeh/redis-password
...
Add password field for redis settings
2019-05-15 14:49:20 -04:00
bobakoftadeh
b3cac0e855
improve password option for redis
2019-04-12 19:55:25 +00:00
bobakoftadeh
6871b5d35c
Add password field for redis settings
2019-04-10 21:20:36 +00:00
Maxim Khlobystov
3fa22c6908
User information lookup feature in HTML5 client.
2019-04-05 18:32:21 -04:00
Anton Georgiev
d2397cba3e
handle change of downloadable pres status
2019-02-15 19:45:42 +00:00
Anton Georgiev
51f7645607
remove REDIS pubsub html5 logs; turned off debug
2019-01-21 17:00:24 +00:00
Anton Georgiev
30c43795af
work on chat alert
2018-10-16 17:48:27 +00:00
Anton Georgiev
1462810b96
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0
2018-09-06 22:06:40 +00:00
Felipe Cecagno
62311387b8
more changes to configure redis using environment variables
2018-08-24 17:15:47 -03:00
Diego Sampaio
6fbb577a9f
Fix redis connection using private settings
2018-08-24 17:15:47 -03:00
Richard Alam
14327a1edf
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch
2018-06-19 12:58:51 -07:00
Anton Georgiev
8aed93c315
improve error logs
2018-06-14 19:01:49 +00: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
Anton Georgiev
cffe245c12
Revert "[HTML5 Client] Whiteboard Bulk Operations"
2018-04-25 20:41:19 -04:00
Maxim Khlobystov
8e2cfce7ff
Improved the error logging when doing bulkWrite.
2018-04-25 20:14:27 +00:00
Maxim Khlobystov
4db94b4489
Some cleanup and code optimizations.
2018-04-25 15:15:36 +00:00
Maxim Khlobystov
8d1e80fbf0
Put the bulk lifespan value into configs.
2018-04-25 14:27:53 +00:00
Maxim Khlobystov
f321011a6f
Cleaned up some console logs.
2018-04-24 15:10:02 +00:00
Maxim Khlobystov
4ef8f0d0c6
Moved pencil to bulk updates.
2018-04-24 13:59:13 +00:00
Maxim Khlobystov
fa58101039
Added time-based grouping for common shapes upserting.
2018-04-05 16:19:41 -04:00
Anton Georgiev
bbab765f82
print length of queue of redis messages to be processed
2018-04-02 20:16:46 +00:00
Anton Georgiev
337bcd616c
add logs to debug user join handler
2018-03-16 18:57:27 +00:00
Oleksandr Zhurbenko
e1568baa24
Fixed the logging of the Meteor serser-side methods
2018-02-05 12:34:03 -08:00
Ghazi Triki
a2feb9bf5b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
2018-01-23 12:27:42 +01:00
Anton Georgiev
44cf02424f
Adjust user guesStatus User property to handle join in BBB 2.1
...
Also add muteOnStart Meeting property and some logs for easier work on redis message handling
2018-01-11 15:05:19 -05:00
Oleksandr Zhurbenko
2de02c4f8d
Linting
2018-01-07 16:25:56 -08:00