You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/09/01 15:28:08 UTC
openmeetings git commit: [OPENMEETINGS-1677] cluster should work on
4.0.0
Repository: openmeetings
Updated Branches:
refs/heads/master 97419b824 -> 62413cec6
[OPENMEETINGS-1677] cluster should work on 4.0.0
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/62413cec
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/62413cec
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/62413cec
Branch: refs/heads/master
Commit: 62413cec6d2039058eebc92a264a54b4e4707377
Parents: 97419b8
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Sep 1 22:28:00 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Sep 1 22:28:00 2017 +0700
----------------------------------------------------------------------
.../core/remote/ScopeApplicationAdapter.java | 4 +-
.../openmeetings/service/user/UserManager.java | 11 ++--
.../apache/openmeetings/util/OmFileHelper.java | 6 +--
.../apache/openmeetings/web/pages/HashPage.java | 2 +-
.../apache/openmeetings/web/room/RoomPanel.java | 2 +-
.../apache/openmeetings/web/room/SwfPanel.java | 54 +-------------------
.../openmeetings/web/room/VideoSettings.java | 54 ++++++++++++++++++--
.../web/room/menu/StartSharingButton.java | 4 +-
8 files changed, 62 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62413cec/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index bb7b3f7..320cfb1 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.core.remote;
+import static org.apache.openmeetings.util.OmFileHelper.HIBERNATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_CAM_QUALITY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_FLASH_ECHO_PATH;
@@ -92,7 +93,6 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
private static final String ROOM_PARAM = "roomClient";
private static final String WIDTH_PARAM = "width";
private static final String HEIGHT_PARAM = "height";
- public static final String HIBERNATE_SCOPE = "hibernate";
public static final String FLASH_SECURE = "secure";
public static final String FLASH_NATIVE_SSL = "native";
public static final String FLASH_PORT = "rtmpPort";
@@ -208,7 +208,7 @@ public class ScopeApplicationAdapter extends MultiThreadedApplicationAdapter imp
String uid = (String)connParams.get("uid");
StreamClient rcm = new StreamClient();
rcm.setScope(conn.getScope().getName());
- boolean hibernate = HIBERNATE_SCOPE.equals(rcm.getScope());
+ boolean hibernate = HIBERNATE.equals(rcm.getScope());
if (hibernate && "noclient".equals(uid)) {
return true;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62413cec/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
index ea7bd0e..885891c 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/user/UserManager.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.service.user;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
import static org.apache.openmeetings.util.OmException.UNKNOWN;
+import static org.apache.openmeetings.util.OmFileHelper.HIBERNATE;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_GROUP_ID;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_DEFAULT_LANG_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_SOAP_REGISTER_KEY;
@@ -251,10 +252,7 @@ public class UserManager implements IUserManager {
if (rcl == null) {
return true;
}
- String scopeName = "hibernate";
- if (rcl.getRoomId() != null) {
- scopeName = rcl.getRoomId().toString();
- }
+ String scopeName = rcl.getRoomId() == null ? HIBERNATE : rcl.getRoomId().toString();
IScope currentScope = scopeAdapter.getChildScope(scopeName);
scopeAdapter.roomLeaveByScope(rcl, currentScope);
@@ -278,10 +276,7 @@ public class UserManager implements IUserManager {
return true;
}
- String scopeName = "hibernate";
- if (rcl.getScope() != null) {
- scopeName = rcl.getScope();
- }
+ String scopeName = rcl.getScope() == null ? HIBERNATE : rcl.getScope();
IScope scope = scopeAdapter.getChildScope(scopeName);
if (scope == null) {
log.warn("### kickById ### The scope is NULL");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62413cec/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
----------------------------------------------------------------------
diff --git a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
index 72fb926..6126b15 100644
--- a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
+++ b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OmFileHelper.java
@@ -37,7 +37,6 @@ public class OmFileHelper {
private static final String STREAMS_DIR = "streams";
private static final String EMOTIONS_DIR = "emoticons";
private static final String LANGUAGES_DIR = "languages";
- private static final String HIBERNATE_DIR = "hibernate";
private static final String CONF_DIR = "conf";
private static final String IMAGES_DIR = "images";
private static final String WML_DIR = "stored";
@@ -48,6 +47,7 @@ public class OmFileHelper {
public static final String PROFILES_DIR = "profiles";
public static final String SCREENSHARING_DIR = "screensharing";
public static final String FILES_DIR = "files";
+ public static final String HIBERNATE = "hibernate";
public static final String PERSISTENCE_NAME = "classes/META-INF/persistence.xml";
public static final String DB_PERSISTENCE_NAME = "classes/META-INF/%s_persistence.xml";
public static final String profilesPrefix = "profile_";
@@ -177,11 +177,11 @@ public class OmFileHelper {
}
public static File getStreamsHibernateDir() {
- return getDir(getStreamsDir(), HIBERNATE_DIR);
+ return getDir(getStreamsDir(), HIBERNATE);
}
public static File getRecording(String name) {
- return new File(getDir(getStreamsDir(), HIBERNATE_DIR), name);
+ return new File(getDir(getStreamsDir(), HIBERNATE), name);
}
public static File getStreamsSubDir(Long id) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62413cec/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index 5af9009..31bff68 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -156,7 +156,7 @@ public class HashPage extends BaseInitedPage implements IUpdatable {
ExtendedClientProperties cp = (ExtendedClientProperties)info.getProperties();
target.appendJavaScript(
String.format("VideoSettings.init(%s);VideoSettings.open();"
- , VideoSettings.getInitJson(cp, "hibernate", "noclient")));
+ , VideoSettings.getInitJson(cp, null, "noclient")));
}
}));
error = false;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62413cec/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index d51aa0e..83406d2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -133,7 +133,7 @@ public class RoomPanel extends BasePanel {
, getUserId(), "0", r.getId()
, cp.getRemoteAddress()
, "" + r.getId());
- JSONObject options = VideoSettings.getInitJson(cp, "" + r.getId(), getClient().getSid());
+ JSONObject options = VideoSettings.getInitJson(cp, r.getId(), getClient().getSid());
options.put("interview", isInterview);
options.put("showMicStatus", !r.getHiddenElements().contains(RoomElement.MicrophoneStatus));
target.appendJavaScript(String.format("VideoManager.init(%s);", options));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62413cec/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
index 9138984..37e33c2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
@@ -23,19 +23,12 @@ import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.FLASH_
import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.FLASH_SECURE;
import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.FLASH_SSL_PORT;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import static org.apache.openmeetings.web.app.Application.NAME_ATTR_KEY;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.wicket.RuntimeConfigurationType.DEVELOPMENT;
import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import org.apache.openmeetings.core.remote.ScopeApplicationAdapter;
-import org.apache.openmeetings.db.dao.room.RoomDao;
-import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
@@ -56,7 +49,6 @@ import org.slf4j.Logger;
import com.github.openjson.JSONArray;
import com.github.openjson.JSONObject;
-import com.hazelcast.core.Member;
public class SwfPanel extends BasePanel {
private static final long serialVersionUID = 1L;
@@ -123,10 +115,6 @@ public class SwfPanel extends BasePanel {
, "network.test.upl", "network.test.upl.bytes", "network.test.upl.time"
, "network.test.upl.speed"
);
- } else if (SWF_TYPE_SETTINGS.equals(type.toString())) {
- lbls = getStringLabels("448", "449", "450", "451", "758", "447", "52", "53", "1429", "1430"
- , "775", "452", "767", "764", "765", "918", "54", "761", "762", "144", "203", "642"
- , "save.success");
}
JSONObject options = new JSONObject().put("src", swf + new PageParametersEncoder().encodePageParameters(pp));
options.put("wmode", cp.isBrowserInternetExplorer() && cp.getBrowserVersionMajor() == 11 ? "opaque" : "direct");
@@ -154,9 +142,7 @@ public class SwfPanel extends BasePanel {
private String getFlashFile(StringValue type) {
String fmt;
- if (SWF_TYPE_SETTINGS.equals(type.toString())) {
- fmt = "main%s.swf11.swf";
- } else if (SWF_TYPE_NETWORK.equals(type.toString())) {
+ if (SWF_TYPE_NETWORK.equals(type.toString())) {
fmt = "networktesting%s.swf10.swf";
} else {
return "";
@@ -171,42 +157,4 @@ public class SwfPanel extends BasePanel {
}
return arr.toString();
}
-
- private static PageParameters addServer(PageParameters pp, Member m) {
- return pp.add("host", m.getAddress().getHost());
- }
-
- private static PageParameters addServer(Long roomId, boolean addBasic) {
- PageParameters pp = new PageParameters();
- if (addBasic) {
- //pp.add("wicketsid", getSid()).add(WICKET_ROOM_ID, roomId).add("language", getLanguage());
- }
-
- long minimum = -1;
- Member result = null;
- Map<Member, Set<Long>> activeRoomsMap = new HashMap<>();
- List<Member> servers = Application.get().getServers();
- if (servers.size() > 1) {
- for (Member m : servers) {
- String serverId = m.getStringAttribute(NAME_ATTR_KEY);
- Set<Long> roomIds = getBean(ISessionManager.class).getActiveRoomIds(serverId);
- if (roomIds.contains(roomId)) {
- // if the room is already opened on a server, redirect the user to that one,
- log.debug("Room is already opened on a server {}", m.getAddress());
- return addServer(pp, m);
- }
- activeRoomsMap.put(m, roomIds);
- }
- for (Map.Entry<Member, Set<Long>> entry : activeRoomsMap.entrySet()) {
- Set<Long> roomIds = entry.getValue();
- long capacity = getBean(RoomDao.class).getRoomsCapacityByIds(roomIds);
- if (minimum < 0 || capacity < minimum) {
- minimum = capacity;
- result = entry.getKey();
- }
- log.debug("Checking server: {} Number of rooms {} RoomIds: {} max(Sum): {}", entry.getKey(), roomIds.size(), roomIds, capacity);
- }
- }
- return result == null ? pp : addServer(pp, result);
- }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62413cec/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
index d7666c7..1d080b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/VideoSettings.java
@@ -25,11 +25,20 @@ import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.FLASH_
import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.FLASH_SSL_PORT;
import static org.apache.openmeetings.core.remote.ScopeApplicationAdapter.FLASH_VIDEO_CODEC;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.web.app.Application.NAME_ATTR_KEY;
import static org.apache.openmeetings.web.app.Application.getBean;
import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.openmeetings.core.remote.ScopeApplicationAdapter;
+import org.apache.openmeetings.db.dao.room.RoomDao;
+import org.apache.openmeetings.db.dao.server.ISessionManager;
+import org.apache.openmeetings.util.OmFileHelper;
+import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.ExtendedClientProperties;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -41,6 +50,7 @@ import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
import com.github.openjson.JSONObject;
+import com.hazelcast.core.Member;
public class VideoSettings extends Panel {
private final static long serialVersionUID = 1L;
@@ -63,7 +73,8 @@ public class VideoSettings extends Panel {
return String.format("%s://%s:%s/%s", protocol, host, port, app);
}
- public static JSONObject getInitJson(ExtendedClientProperties cp, String scope, String sid) {
+ public static JSONObject getInitJson(ExtendedClientProperties cp, Long roomId, String sid) {
+ String scope = roomId == null ? OmFileHelper.HIBERNATE : "" + roomId;
JSONObject gs = getBean(ScopeApplicationAdapter.class).getFlashSettings();
JSONObject s = new JSONObject()
.put(FLASH_VIDEO_CODEC, gs.get(FLASH_VIDEO_CODEC))
@@ -75,17 +86,50 @@ public class VideoSettings extends Panel {
String path = url.getPath();
path = path.substring(1, path.indexOf('/', 2) + 1) + scope;
s.put(FLASH_NATIVE_SSL, gs.getBoolean(FLASH_NATIVE_SSL));
+ String host = getHost(roomId, url.getHost());
int port = url.getPort() > -1 ? url.getPort() : url.getDefaultPort();
if (gs.getBoolean(FLASH_SECURE)) {
- s.put(URL, getUri("rtmps", url.getHost(), gs.getString(FLASH_SSL_PORT), path));
- s.put(FALLBACK, getUri("rtmps", url.getHost(), port, path));
+ s.put(URL, getUri("rtmps", host, gs.getString(FLASH_SSL_PORT), path));
+ s.put(FALLBACK, getUri("rtmps", host, port, path));
} else {
- s.put(URL, getUri("rtmp", url.getHost(), gs.getString(FLASH_PORT), path));
- s.put(FALLBACK, getUri("rtmpt", url.getHost(), port, path));
+ s.put(URL, getUri("rtmp", host, gs.getString(FLASH_PORT), path));
+ s.put(FALLBACK, getUri("rtmpt", host, port, path));
}
} catch (Exception e) {
log.error("Error while constructing video settings parameters", e);
}
return s;
}
+
+ private static String getHost(Long roomId, String _host) {
+ if (roomId == null) {
+ return _host;
+ }
+ long minimum = -1;
+ Member result = null;
+ Map<Member, Set<Long>> activeRoomsMap = new HashMap<>();
+ List<Member> servers = Application.get().getServers();
+ if (servers.size() > 1) {
+ for (Member m : servers) {
+ String serverId = m.getStringAttribute(NAME_ATTR_KEY);
+ Set<Long> roomIds = getBean(ISessionManager.class).getActiveRoomIds(serverId);
+ if (roomIds.contains(roomId)) {
+ // if the room is already opened on a server, redirect the user to that one,
+ log.debug("Room is already opened on a server {}", m.getAddress());
+ return m.getAddress().getHost();
+ }
+ activeRoomsMap.put(m, roomIds);
+ }
+ for (Map.Entry<Member, Set<Long>> entry : activeRoomsMap.entrySet()) {
+ Set<Long> roomIds = entry.getValue();
+ long capacity = getBean(RoomDao.class).getRoomsCapacityByIds(roomIds);
+ if (minimum < 0 || capacity < minimum) {
+ minimum = capacity;
+ result = entry.getKey();
+ }
+ log.debug("Checking server: {} Number of rooms {} RoomIds: {} max(Sum): {}", entry.getKey(), roomIds.size(), roomIds, capacity);
+ }
+ }
+ return result == null ? _host : result.getAddress().getHost();
+ }
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/62413cec/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
index 3efae15..1ba6ff3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
@@ -94,8 +94,8 @@ public class StartSharingButton extends OmButton {
app = IOUtils.toString(jnlp, UTF_8);
Client c = getOnlineClient(uid);
String sid = c.getSid();
- long roomId = c.getRoom().getId();
- JSONObject s = VideoSettings.getInitJson(WebSession.get().getExtendedProperties(), "" + roomId, sid);
+ Long roomId = c.getRoom().getId();
+ JSONObject s = VideoSettings.getInitJson(WebSession.get().getExtendedProperties(), roomId, sid);
String _url = s.getString(VideoSettings.URL);
Room room = getBean(RoomDao.class).get(roomId);
ISessionManager sessionManager = getBean(ISessionManager.class);