Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutt…

…on into merge-2.2-into-develop
gitisara · May 25, 2020 · 9f60e92 · 9f60e92
2 parents 82930ad + 2f665bb
commit 9f60e92
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/bigbluebutton-config/cron.hourly/bbb-resync-freeswitch b/bigbluebutton-config/cron.hourly/bbb-resync-freeswitch
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/opt/freeswitch/bin/fs_cli -x 'fsctl sync_clock_when_idle' > /var/log/freeswitch_sync_clock.log 2>&1
diff --git a/bigbluebutton-html5/imports/startup/server/redis.js b/bigbluebutton-html5/imports/startup/server/redis.js
@@ -240,7 +240,7 @@ class RedisPubSub {
     };
 
     if (!meetingId || !userId) {
-      return Logger.warn(`Interrupted publishing of ${JSON.stringify(header)} due to missing data`);
+      Logger.warn(`Publishing ${eventName} with potentially missing data userId=${userId} meetingId=${meetingId}`);
     }
     const envelope = makeEnvelope(channel, eventName, header, payload, { meetingId, userId });
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		/opt/freeswitch/bin/fs_cli -x 'fsctl sync_clock_when_idle' > /var/log/freeswitch_sync_clock.log 2>&1