This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new c0ab7d0 [OPENMEETINGS-1856] sonar should be more happy
c0ab7d0 is described below
commit c0ab7d092c348577655e5fb18835cc2dc68a1579
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Sun Oct 28 13:11:14 2018 +0700
[OPENMEETINGS-1856] sonar should be more happy
---
.../openmeetings/core/remote/KurentoHandler.java | 68 +++++++++++-----------
.../apache/openmeetings/web/room/NetTestPanel.java | 33 +++++------
2 files changed, 49 insertions(+), 52 deletions(-)
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index a07ffcb..1668145 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -118,28 +118,7 @@ public class KurentoHandler {
public void init() {
check = () -> {
try {
- client = KurentoClient.create(kurentoWsUrl, new
KurentoConnectionListener() {
- @Override
- public void reconnected(boolean
sameServer) {
- log.info("Kurento reconnected ?
{}", sameServer);
- }
-
- @Override
- public void disconnected() {
- log.warn("Disconnected, will
re-try in {} ms", checkTimeout);
-
recheckScheduler.schedule(check, checkTimeout, MILLISECONDS);
- }
-
- @Override
- public void connectionFailed() {
- log.info("Kurento
connectionFailed");
- }
-
- @Override
- public void connected() {
- log.info("Kurento connected");
- }
- });
+ client = KurentoClient.create(kurentoWsUrl, new
KConnectionListener());
kuid = randomUUID().toString();
client.getServerManager().addObjectCreatedListener(new KWatchDog());
} catch (Exception e) {
@@ -627,6 +606,29 @@ public class KurentoHandler {
this.turnTtl = turnTtl;
}
+ private class KConnectionListener implements KurentoConnectionListener {
+ @Override
+ public void reconnected(boolean sameServer) {
+ log.info("Kurento reconnected ? {}", sameServer);
+ }
+
+ @Override
+ public void disconnected() {
+ log.warn("Disconnected, will re-try in {} ms",
checkTimeout);
+ recheckScheduler.schedule(check, checkTimeout,
MILLISECONDS);
+ }
+
+ @Override
+ public void connectionFailed() {
+ log.info("Kurento connectionFailed");
+ }
+
+ @Override
+ public void connected() {
+ log.info("Kurento connected");
+ }
+ }
+
private class KWatchDog implements EventListener<ObjectCreatedEvent> {
private ScheduledExecutorService scheduler;
@@ -647,21 +649,17 @@ public class KurentoHandler {
// still alive
MediaPipeline pipe =
client.getById(roid, MediaPipeline.class);
Map<String, String> tags =
tagsAsMap(pipe);
- try {
- if (validTestPipeline(tags)) {
+ if (validTestPipeline(tags)) {
+ return;
+ }
+ if (kuid.equals(tags.get(TAG_KUID))) {
+ KRoom r =
rooms.get(Long.valueOf(tags.get(TAG_ROOM)));
+ if
(r.getPipelineId().equals(pipe.getId())) {
return;
+ } else if (r != null) {
+
rooms.remove(r.getRoomId());
+
r.close(KurentoHandler.this);
}
- if
(kuid.equals(tags.get(TAG_KUID))) {
- KRoom r =
rooms.get(Long.valueOf(tags.get(TAG_ROOM)));
- if
(r.getPipelineId().equals(pipe.getId())) {
- return;
- } else if (r != null) {
-
rooms.remove(r.getRoomId());
-
r.close(KurentoHandler.this);
- }
- }
- } catch(Exception e) {
- //no-op, connect will be dropped
}
log.warn("Invalid MediaPipeline {}
detected, will be dropped, tags: {}", pipe.getId(), tags);
pipe.release();
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.java
index 7543dd2..a05f5f6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.java
@@ -52,28 +52,27 @@ public class NetTestPanel extends BasePanel {
@Override
protected void onClientInfo(AjaxRequestTarget target,
WebClientInfo info) {
super.onClientInfo(target, info);
-
target.appendJavaScript(String.format("NetTest.init(%s);", getStringLabels(
- "network.test.ms",
"network.test.mb", "network.test.sec"
- , "network.test.click.play",
"network.test.copy.log"
- , "network.test.report",
"network.test.report.start", "network.test.report.error"
- , "network.test.report.con.err"
- , "network.test.ping",
"network.test.ping.avg", "network.test.ping.rcv"
- , "network.test.ping.lost",
"network.test.ping.load"
- , "network.test.port",
"network.test.port.avail", "network.test.port.stopped"
- , "network.test.jitter",
"network.test.jitter.avg", "network.test.jitter.min"
- , "network.test.jitter.max"
- , "network.test.dwn",
"network.test.dwn.bytes", "network.test.dwn.time"
- , "network.test.dwn.speed"
- , "network.test.upl",
"network.test.upl.bytes", "network.test.upl.time"
- , "network.test.upl.speed"
- )));
+
target.appendJavaScript(String.format("NetTest.init(%s);", getStringLabels()));
}
});
}
- public JSONObject getStringLabels(String... ids) {
+ private JSONObject getStringLabels() {
JSONObject o = new JSONObject();
- for (String id : ids) {
+ for (String id : new String[] {"network.test.ms",
"network.test.mb", "network.test.sec"
+ , "network.test.click.play",
"network.test.copy.log"
+ , "network.test.report",
"network.test.report.start", "network.test.report.error"
+ , "network.test.report.con.err"
+ , "network.test.ping", "network.test.ping.avg",
"network.test.ping.rcv"
+ , "network.test.ping.lost",
"network.test.ping.load"
+ , "network.test.port",
"network.test.port.avail", "network.test.port.stopped"
+ , "network.test.jitter",
"network.test.jitter.avg", "network.test.jitter.min"
+ , "network.test.jitter.max"
+ , "network.test.dwn", "network.test.dwn.bytes",
"network.test.dwn.time"
+ , "network.test.dwn.speed"
+ , "network.test.upl", "network.test.upl.bytes",
"network.test.upl.time"
+ , "network.test.upl.speed"})
+ {
o.put(id.substring("network.test.".length()),
getString(id));
}
return o;
