Commit Graph

360 Commits

Author SHA1 Message Date
Ramón Souza
0105373cee
Applies changes needed to serve locale files as static content (#11234)
* moving locales folder to /public and applying changes needed to serve locales as static files

* better dev/prod check

* transifex pull script changes to match new locales directory + ignore locales with less than 100 lines

* fix local/prod locales path

* merge fallback messages

* applies new locale changes to legacy client

`bbb-html5.nginx` file content should also be changed to the following:

```
location /html5client/locales {
  alias /usr/share/meteor/bundle/programs/web.browser/app/locales;
}

location /html5client/compatibility {
  alias /usr/share/meteor/bundle/programs/web.browser/app/compatibility;
}

location /html5client/resources {
  alias /usr/share/meteor/bundle/programs/web.browser/app/resources;
}

location /html5client/svgs {
  alias /usr/share/meteor/bundle/programs/web.browser/app/svgs;
}

location /html5client/fonts {
  alias /usr/share/meteor/bundle/programs/web.browser/app/fonts;
}

location /html5client {
  # proxy_pass http://127.0.0.1:4100; # use for development
  proxy_pass http://poolhtml5servers; # use for production
  proxy_http_version 1.1;
  proxy_set_header Upgrade $http_upgrade;
  proxy_set_header Connection "Upgrade";
}
```
2021-03-11 06:42:41 -05:00
Ramon Souza
fb22eca58d fix legacy client with customHeartbeat:false 2021-03-10 15:14:25 -03:00
Joao Siebel
31d49536e8 Add extra logs when handling messages on redis 2021-02-24 17:56:14 -03:00
Anton Georgiev
111109674e
Merge pull request #11247 from ramonlsouza/language-dropdown
Reduces the number of options displayed on locale settings dropdown
2021-02-22 15:44:29 -05:00
Aaditya Prakash
c3a7fde807 Implemented merge option for default and local settings. 2021-02-19 14:44:23 +01:00
Anton Georgiev
683847304d on frontend attempt to handle events without matching queue 2021-02-17 20:51:36 +00:00
Anton Georgiev
1cedc56504 process only some of CreateMeeting logic in frontends to avoid meeting duplication 2021-02-16 15:12:25 +00:00
Anton Georgiev
f43560d535 Support for backend vs frontend nodejs instances bbb-html5 2021-02-16 03:19:31 +00:00
Anton Georgiev
8c0f0fdd52 Split Meteor roles backend-frontend revisit 2021-02-05 17:47:46 +00:00
Ramon Souza
55651506a4 improve language selector filter, closes #10706 2021-02-02 15:44:58 -03:00
Joao Siebel
68b2752e0d Add flag to enable sync 2021-01-29 14:27:13 -03:00
Joao Siebel
8c7c21f936 Sync users in collection with server active connections 2021-01-26 16:22:32 -03:00
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
Joao Siebel
c5b8f30f5d Add option to generate heapdump file and improve metrics 2020-12-15 13:10:39 -03: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
e9d05454ea Remvoe console 2020-12-10 13:52:25 -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
0020d2b079 Add try/catch in custom send function 2020-12-08 19:53:33 +00:00
Joao Siebel
6e529e5292 Add try/catch to heartbeat function 2020-12-08 19:53:33 +00:00
Joao Siebel
240b75ea65 cherry-pick PR #10953 2020-12-08 19:50:18 +00: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
Joao Siebel
fc1b06c3e7 Add try/catch in custom send function 2020-12-03 15:07:24 -03:00
Joao Siebel
5d95e5ca1d Add try/catch to heartbeat function 2020-12-02 16:43:34 -03:00
Joao Siebel
d9a046fba9 Log uncaught errors in node 2020-12-02 16:06:42 -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
Joao Siebel
c34d5381fe Add flag to enable/disable custom heartbeat functions 2020-11-26 11:19:59 -03: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
Tainan Felipe
8650e0500b Port socket sockejs timeout to 2.3 2020-11-20 14:31:24 -03: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
Joao Siebel
b6b211f4fb Tweak heartbeat 2020-11-16 18:37:25 -03:00
Joao Siebel
1c47023e8a Add original function link for reference 2020-11-16 10:46:18 -03:00
Joao Siebel
3a2d06fd88 Tweak sockjs timeout value 2020-11-13 18:41:56 -03:00
Anton Georgiev
a8dc7a0bff Simplified redis debug and placed behind check 2020-11-12 21:03:57 -05:00
Anton Georgiev
5ba12846d5
Update index.js 2020-10-28 15:17:17 -04:00
Joao Siebel
e50c348874 WIP improve log 2020-10-21 14:27:40 -03:00
Joao Siebel
dadca62741 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-10-13 10:49:12 -03:00
Anton Georgiev
124b2d9b51
Merge branch 'develop' into move-guest-wait 2020-09-21 16:28:59 -04:00
Joao Siebel
b2adffa4c2 Merge remote-tracking branch 'upstream/develop' into connection-manager 2020-09-18 16:30:20 -03:00
Anton Georgiev
3b2446989e recalculate locales on new request if there was issue on start 2020-09-10 14:32:42 +00:00
Joao Siebel
ac0a014571 WIP onClose 2020-09-10 08:49:22 -03:00
Anton Georgiev
fd0e69c280 Added fallback support for Armenian, Georgian, Occitan 2020-09-10 03:21:41 +00:00
Anton Georgiev
707f80a785 Only calculate locales list once, on process start 2020-09-10 01:27:03 +00:00
Anton Georgiev
e3d1fa2c17 return all locales, not just an empty [] 2020-09-10 00:37:43 +00:00
Joao Siebel
6e4e0a510a Merge branch 'remove-user-on-exit' into connection-manager 2020-09-08 16:36:01 -03:00
Joao Siebel
b8f42ac712 Create ClientConnections structure and auth-token-validation collection 2020-09-01 09:07:56 -03:00
Joao Siebel
f33bd10640 Remove user from collection when leaves 2020-08-19 13:22:43 -03:00
Tainan Felipe
c9d75a15f8
Update bigbluebutton-html5/imports/startup/server/index.js
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2020-08-12 17:15:16 -03:00
Anton Georgiev
c6669d1d7a
Merge branch 'develop' into move-guest-wait 2020-07-28 13:50:04 -04:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219 2020-07-28 13:28:32 -03:00
Anton Georgiev
55d8d4b199
Merge pull request #9529 from Tainan404/issue-9128
Rework locales list generation
2020-07-28 11:10:38 -04:00
Tainan Felipe
30528fb014 Remove comment 2020-07-02 17:45:06 -03:00
Tainan Felipe
1c8677d7d8 Move guest wait from bbb-client to bbb-html 2020-07-02 17:14:49 -03:00
Anton Georgiev
1a7c07e380
Merge pull request #9113 from sualko/feat/html5/settings
add env to specify settings location
2020-05-28 16:21:25 -04:00
Tainan Felipe
5e5f4cc93b Move locales fallback to a json file 2020-05-26 11:15:17 -03:00
Tainan Felipe
aa668e3f91 Merge remote-tracking branch 'upstream/develop' into issue-9219 2020-05-25 17:05:58 -03:00
Tainan Felipe
db8e7fcd39 Update react-intl and add fallback to unsupported languages 2020-05-25 17:00:13 -03:00
Anton Georgiev
9f60e925b5 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 19:55:36 +00:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00: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
Tainan Felipe
6a340e9401 Rework locales list generation 2020-05-13 14:05:59 -03:00
Anton Georgiev
cc79c4b6ae merge 2.2.10 into 2.3 2020-05-05 19:52:44 +00:00
sualko
6a5b9a98e2 add env to specify settings location
this would allow package maintaner to move config to /etc

see #9085
2020-04-16 17:06:52 +02:00
KDSBrowne
e15e45b149 fix render loop after changing locale when override setting is set 2020-03-26 13:32:15 +00:00
Anton Georgiev
606ca5887a Revert "Merge pull request #8755 from KDSBrowne/fix-override-locale-loop"
This reverts commit 004d872584, reversing
changes made to ebdcf621b7.
2020-03-25 16:12:15 -04:00
KDSBrowne
af14345185 fix render loop after changing locale when override setting is set 2020-03-11 13:55:41 +00:00
Anton Georgiev
3754d0ab6f Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020 2020-02-28 17:47:06 -05:00
Anton Georgiev
1fa426058f corrected issues related to publishing and methods 2020-02-13 14:19:29 -05:00
Anton Georgiev
689427b092 commented out memwatch usage - not supported on node12 2019-12-03 20:26:45 +00:00
Richard Alam
62e5e599d3 - add timestamp field to messages sent from html5 server 2019-10-18 09:50:38 -07:00
Chad Pilkey
42bad2142e fix check for heapdump enabled 2019-10-08 10:40:53 -07:00
Joao Siebel
678e81e8f2 Add configuration to enable the heap dump file
and create a rule to only generate a new heap dump
if the current memory usage is bigger than the given threshold
2019-09-24 18:50:37 -03:00
Joao Siebel
35061811b7 Add heapdump dependecy 2019-09-24 17:09:56 -03:00
Anton Georgiev
8172da84af
Bumped up loglevel of memwatch to 'info'
in settings.yml we have set to not log < info so these would not be logged if 'debug'
2019-09-09 15:21:27 -04:00
Anton Georgiev
f0a35a7381 add monitor for memory usage in nodejs html5 2019-09-09 14:45:54 -04:00
Anton Georgiev
cdb03042ee
Merge pull request #7952 from KDSBrowne/issue-7148
Reduce chance of text Area displaying invisible border
2019-08-28 15:13:00 -04:00
Anton Georgiev
6e09b836b8
Merge pull request #7767 from diegobenetti/issue7751-feedback-errors
Fixes exception in meteor log when the meeting is ended
2019-08-28 15:11:10 -04:00
KDSBrowne
74ac34c407 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into issue-7148 2019-08-19 13:44:36 +00:00
Chad Pilkey
4e70185011 fix html5 server logger initialization 2019-08-02 10:20:06 -07:00
Anton Georgiev
fd894a4d2c
Merge pull request #7753 from Tainan404/Add-pong-time-to-settings
Add pong and clear users intervals times to settings
2019-07-30 13:18:26 -04:00
Diego Benetti
990f7b5209 Changes the message and log level for user not found on feedback 2019-07-22 16:32:14 -03:00
Diego Benetti
2d66704bcf Fixes exception in meteor log when the meeting is ended 2019-07-11 17:51:09 -03:00
KDSBrowne
4a9a833755 add browser locale detection override prop to settings.yml 2019-07-10 13:19:00 +00:00
Tainan Felipe
8ffa84e39b Add pong and clear users intervals times to settings 2019-07-08 16:49:09 -03:00
Chad Pilkey
cb58037ea1 fix crash from invalid online users 2019-07-08 19:04:12 +00:00
Chad Pilkey
e720bcf60c fix html5 server exceptions 2019-07-06 22:48:33 +00:00
Tainan Felipe
1819911054 Merge branch 'fix-user-leaving' of https://github.com/Tainan404/bigbluebutton into fix-user-leaving 2019-07-02 14:34:18 -03:00
Tainan Felipe
a6cc0286d0 Fix comparasion code 2019-07-02 14:32:16 -03:00
Tainan Felipe
9df7ba1a1a
Merge branch 'master' into fix-user-leaving 2019-07-01 17:24:09 -03:00