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

Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Richard Alam 2012-01-11 21:52:06 +00:00
commit 4777469523
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bigbluebutton-config/bin/bbb-record
View File

@ -373,6 +373,11 @@ if [ $CHECK ]; then
echo " -- ERRORS found while archiving files -- "
cat /tmp/t
echo
grep "on ASCII" /tmp/t > /tmp/u
if [ -s /tmp/u ]; then
echo " -- events.xml was not created. There is a problem with the character encoding "
echo
fi
fi
fi
#

29
bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
View File

@ -243,18 +243,27 @@ public class MeetingService {
public void meetingStarted(String meetingId) {
Meeting m = getMeeting(meetingId);
if (m != null) {
log.debug("Setting meeting started time");
m.setStartTime(System.currentTimeMillis());
if(m.getStartTime() == 0){
log.debug("Setting meeting " + meetingId + " started time");
m.setStartTime(System.currentTimeMillis());
}else{
log.debug("The meeting " + meetingId + " has been started again...");
}
m.setEndTime(0);
return;
}
log.warn("The meeting " + meetingId + " doesn't exist");
}
@Override
public void meetingEnded(String meetingId) {
Meeting m = getMeeting(meetingId);
if (m != null) {
log.debug("Setting meeting end time");
log.debug("Setting meeting " + meetingId + " end time");
m.setEndTime(System.currentTimeMillis());
return;
}
log.warn("The meeting " + meetingId + " doesn't exist");
}
@Override
@ -263,8 +272,10 @@ public class MeetingService {
if (m != null) {
User user = new User(internalUserId, externalUserId, name, role);
m.userJoined(user);
log.debug("New user in meeting:" + user.getFullname());
log.debug("New user in meeting " + meetingId + ":" + user.getFullname());
return;
}
log.warn("The meeting " + meetingId + " doesn't exist");
}
@Override
@ -273,11 +284,13 @@ public class MeetingService {
if (m != null) {
User user = m.userLeft(internalUserId);
if(user != null){
log.debug("User removed from meeting:" + user.getFullname());
log.debug("User removed from meeting " + meetingId + ":" + user.getFullname());
return;
}
log.warn("The participant " + internalUserId + " doesn't exist in the meeting " + meetingId);
log.warn("The participant " + internalUserId + " doesn't exist in the meeting " + meetingId);
return;
}
log.warn("The meeting " + meetingId + " doesn't exist");
}
@Override
@ -287,11 +300,13 @@ public class MeetingService {
User user = m.getUserById(internalUserId);
if(user != null){
user.setStatus(status, value);
log.debug("Setting new status value for participant:"+user.getFullname());
log.debug("Setting new status value in meeting " + meetingId + " for participant:"+user.getFullname());
return;
}
log.warn("The participant " + internalUserId + " doesn't exist in the meeting " + meetingId);
return;
}
log.warn("The meeting " + meetingId + " doesn't exist");
}
}