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

Merge pull request #10868 from antobinary/nodejs-port-4000

Browse Source 
parse instanceId as int; develop on port 4000
This commit is contained in:
Anton Georgiev 2020-11-19 10:34:39 -05:00 committed by GitHub
commit 5825e15dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bigbluebutton-html5/imports/startup/server/redis.js
View File

@ -108,8 +108,8 @@ class RedisPubSub {
this.didSendRequestEvent = false;
const host = process.env.REDIS_HOST || Meteor.settings.private.redis.host;
const redisConf = Meteor.settings.private.redis;
this.instanceMax = parseInt(process.env.INSTANCE_MAX || "1");
this.instanceId = process.env.INSTANCE_ID || "1";
this.instanceMax = parseInt(process.env.INSTANCE_MAX || 1);
this.instanceId = parseInt(process.env.INSTANCE_ID) || 1;
const { password, port } = redisConf;
@ -187,14 +187,14 @@ class RedisPubSub {
if (eventName === 'MeetingCreatedEvtMsg'){
const newIntId = parsedMessage.core.body.props.meetingProp.intId;
const metadata = parsedMessage.core.body.props.metadataProp.metadata;
const instanceId = metadata['bbb-meetinginstance'];
const instanceId = parseInt(metadata['bbb-meetinginstance']) || 1;
Logger.info("MeetingCreatedEvtMsg received with meetingInstance: " + instanceId + " -- this is instance: " + this.instanceId);
Logger.warn("MeetingCreatedEvtMsg received with meetingInstance: " + instanceId + " -- this is instance: " + this.instanceId);
if (instanceId === this.instanceId){
this.mettingsQueues[newIntId] = new MeetingMessageQueue(this.emitter, async, this.debug);
} else {
// Logger.error('THIS NODEJS IS **NOT** PROCESSING EVENTS FOR THIS MEETING')
// Logger.error('THIS NODEJS ' + this.instanceId + ' IS **NOT** PROCESSING EVENTS FOR THIS MEETING ' + instanceId)
}
}

6
bigbluebutton-html5/package.json
View File

@ -8,9 +8,9 @@
"generate-refs-visual-regression": "rm -rf tests/webdriverio/screenshots; npm run test-visual-regression",
"test-visual-regression-desktop": "export BROWSER_NAME=firefox; wdio ./tests/webdriverio/wdio.vreg.conf.js; export BROWSER_NAME=chrome; wdio ./tests/webdriverio/wdio.vreg.conf.js",
"generate-refs-visual-regression-desktop": "rm -rf tests/webdriverio/screenshots; npm run test-visual-regression-desktop",
"start:prod": "meteor reset && ROOT_URL=http://127.0.0.1/html5client NODE_ENV=production meteor --production",
"start:dev": "ROOT_URL=http://127.0.0.1/html5client NODE_ENV=development meteor",
"start:dev-fast-mongo": "env ROOT_URL=http://127.0.0.1/html5client MONGO_OPLOG_URL=mongodb://127.0.1.1/local MONGO_URL=mongodb://127.0.1.1/meteor PORT=3000 ROOT_URL=http://127.0.0.1/html5client NODE_ENV=development meteor",
"start:prod": "meteor reset && ROOT_URL=http://127.0.0.1/html5client/1 meteor run --production --port=4000",
"start:dev": "ROOT_URL=http://127.0.0.1/html5client/1 meteor run --port=4000",
"start:dev-fast-mongo": "env ROOT_URL=http://127.0.0.1/html5client/1 MONGO_OPLOG_URL=mongodb://127.0.1.1/local MONGO_URL=mongodb://127.0.1.1/meteor ROOT_URL=http://127.0.0.1/html5client/1 NODE_ENV=development meteor run --port=4000",
"test": "wdio ./tests/webdriverio/wdio.conf.js",
"lint": "eslint . --ext .jsx,.js"
},