Merge pull request #4836 from ritzalam/fix-client-logout-timer

- make client logout timer configurable in bigbluebutton.properties

bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java

@@ -88,6 +88,7 @@ public class ParamsProcessorUtil {
     private Long maxPresentationFileUpload = 30000000L; // 30MB
 
     private Integer maxInactivityTimeoutMinutes = 120;
+    private Integer clientLogoutTimerInMinutes = 0;
 		private Integer warnMinutesBeforeMax = 5;
 		private Integer meetingExpireIfNoUserJoinedInMinutes = 5;
 		private Integer meetingExpireWhenLastUserLeftInMinutes = 1;
@@ -353,7 +354,7 @@ public class ParamsProcessorUtil {
         boolean record = processRecordMeeting(params.get("record"));
         int maxUsers = processMaxUser(params.get("maxParticipants"));
         int meetingDuration = processMeetingDuration(params.get("duration"));
-        int logoutTimer = processMeetingDuration(params.get("logoutTimer"));
+        int logoutTimer = processLogoutTimer(params.get("logoutTimer"));
         
         // Banner parameters
         String bannerText = params.get("bannerText");
@@ -656,8 +657,20 @@ public class ParamsProcessorUtil {
     }   
     
     return mDuration;
-  } 
-  	
+  }
+
+	public int processLogoutTimer(String logoutTimer) {
+		int mDuration = clientLogoutTimerInMinutes;
+
+		try {
+			mDuration = Integer.parseInt(logoutTimer);
+		} catch(Exception ex) {
+			mDuration = clientLogoutTimerInMinutes;
+		}
+
+		return mDuration;
+	}
+
 	public boolean isTestMeeting(String telVoice) {	
 		return ((! StringUtils.isEmpty(telVoice)) && 
 				(! StringUtils.isEmpty(testVoiceBridge)) && 
@@ -896,6 +909,10 @@ public class ParamsProcessorUtil {
 		maxInactivityTimeoutMinutes = value;
 	}
 
+	public void setClientLogoutTimerInMinutes(Integer value) {
+		clientLogoutTimerInMinutes = value;
+	}
+
 	public void setWarnMinutesBeforeMax(Integer value) {
 		warnMinutesBeforeMax = value;
 	}

bigbluebutton-web/grails-app/conf/bigbluebutton.properties

@@ -128,6 +128,10 @@ defaultMeetingDuration=0
 # ending the meeting
 maxInactivityTimeoutMinutes=120
 
+# Number of minutes to logout client if user
+# isn't responsive
+clientLogoutTimerInMinutes=0
+
 # Send warning to moderators to warn that
 # meeting would be ended due to inactivity
 warnMinutesBeforeMax=5

bigbluebutton-web/grails-app/conf/spring/resources.xml

@@ -139,6 +139,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         <property name="meetingExpireIfNoUserJoinedInMinutes" value="${meetingExpireIfNoUserJoinedInMinutes}"/>
         <property name="meetingExpireWhenLastUserLeftInMinutes" value="${meetingExpireWhenLastUserLeftInMinutes}"/>
         <property name="maxPresentationFileUpload" value="${maxFileSizeUpload}"/>
+        <property name="clientLogoutTimerInMinutes" value="${clientLogoutTimerInMinutes}"/>
     </bean>
 
     <import resource="doc-conversion.xml"/>