[jira] [Commented] (OPENMEETINGS-2567) Investigate Performance logging options
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2567?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278622#comment-17278622 ] ASF subversion and git services commented on OPENMEETINGS-2567: --- Commit 6bbfb51dd94d7472b937bc3e7880a1b828d5cada in openmeetings's branch refs/heads/feature/OPENMEETINGS-2567-investigate-performance-monitoring from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=6bbfb51 ] OPENMEETINGS-2567 Add basic configuration for different types of metrics. > Investigate Performance logging options > --- > > Key: OPENMEETINGS-2567 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2567 > Project: Openmeetings > Issue Type: Task > Components: Performance >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > > A placeholder Jira to log changes around investigating performance logging > options. > Investigation happen in branch, but still good to have Jira to log commits in > it. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch feature/OPENMEETINGS-2567-investigate-performance-monitoring updated: OPENMEETINGS-2567 Add basic configuration for different types of metrics.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2567-investigate-performance-monitoring
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to
refs/heads/feature/OPENMEETINGS-2567-investigate-performance-monitoring by this
push:
new 6bbfb51 OPENMEETINGS-2567 Add basic configuration for different types
of metrics.
6bbfb51 is described below
commit 6bbfb51dd94d7472b937bc3e7880a1b828d5cada
Author: Sebastian Wagner
AuthorDate: Thu Feb 4 20:40:31 2021 +1300
OPENMEETINGS-2567 Add basic configuration for different types of metrics.
---
openmeetings-core/pom.xml | 13 -
.../openmeetings/core/remote/StreamProcessor.java | 4 +-
.../apache/openmeetings/db/dao/basic/ChatDao.java | 9 +++
.../db/dao/basic/ConfigurationDao.java | 9 +++
.../openmeetings/db/dao/file/FileItemDao.java | 10
.../apache/openmeetings/db/dao/room/RoomDao.java | 5 ++
.../openmeetings/db/dao/server/SOAPLoginDao.java | 4 ++
.../openmeetings/db/dao/server/SessiondataDao.java | 4 ++
.../apache/openmeetings/db/dao/user/UserDao.java | 15 +
openmeetings-util/pom.xml | 18 ++
.../util/logging/PrometheusAspect.java | 40 ++
.../openmeetings/util/logging/PrometheusUtil.java | 16 ++
.../logging/{Timed.java => TimedApplication.java} | 4 +-
.../logging/{Timed.java => TimedDatabase.java} | 4 +-
.../apache/openmeetings/web/room/RoomPanel.java| 63 -
.../openmeetings/web/room/menu/RoomMenuPanel.java | 64 --
.../openmeetings/web/room/sidebar/RoomSidebar.java | 43 +--
17 files changed, 199 insertions(+), 126 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 617b3ae..217fa9e 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -100,19 +100,6 @@
${spring.version}
- org.springframework
- spring-aop
-
-
- org.aspectj
- aspectjtools
- 1.9.6
-
-
- io.prometheus
- simpleclient
-
-
org.kurento
kurento-client
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index 0355abe..18773dd 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -38,7 +38,6 @@ import
org.apache.openmeetings.core.converter.IRecordingConverter;
import org.apache.openmeetings.core.converter.InterviewConverter;
import org.apache.openmeetings.core.converter.RecordingConverter;
import org.apache.openmeetings.core.util.WebSocketHelper;
-import org.apache.openmeetings.core.util.logging.Timed;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.basic.Client.Activity;
@@ -51,6 +50,7 @@ import
org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.manager.IClientManager;
import org.apache.openmeetings.db.util.ws.RoomMessage;
import org.apache.openmeetings.db.util.ws.TextRoomMessage;
+import org.apache.openmeetings.util.logging.TimedApplication;
import org.apache.wicket.util.string.Strings;
import org.kurento.client.IceCandidate;
import org.kurento.client.internal.server.KurentoServerException;
@@ -84,7 +84,7 @@ public class StreamProcessor implements IStreamProcessor {
@Autowired
private InterviewConverter interviewConverter;
- @Timed
+ @TimedApplication
void onMessage(Client c, final String cmdId, JSONObject msg) {
final String uid = msg.optString("uid");
KStream sender;
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
index 2624887..3d5e5a3 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ChatDao.java
@@ -28,6 +28,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.apache.openmeetings.db.entity.basic.ChatMessage;
+import org.apache.openmeetings.util.logging.TimedDatabase;
import org.springframework.stereotype.Repository;
import
[jira] [Commented] (OPENMEETINGS-2567) Investigate Performance logging options
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2567?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278546#comment-17278546 ] ASF subversion and git services commented on OPENMEETINGS-2567: --- Commit c9858af621a6459b4e9e9fc1478c3e7aaa639255 in openmeetings's branch refs/heads/feature/OPENMEETINGS-2567-investigate-performance-monitoring from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=c9858af ] OPENMEETINGS-2567 Rewrite to use common namespace for openmeetings app related metrics. > Investigate Performance logging options > --- > > Key: OPENMEETINGS-2567 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2567 > Project: Openmeetings > Issue Type: Task > Components: Performance >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > > A placeholder Jira to log changes around investigating performance logging > options. > Investigation happen in branch, but still good to have Jira to log commits in > it. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch feature/OPENMEETINGS-2567-investigate-performance-monitoring updated: OPENMEETINGS-2567 Rewrite to use common namespace for openmeetings app related metrics.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/OPENMEETINGS-2567-investigate-performance-monitoring in repository https://gitbox.apache.org/repos/asf/openmeetings.git The following commit(s) were added to refs/heads/feature/OPENMEETINGS-2567-investigate-performance-monitoring by this push: new c9858af OPENMEETINGS-2567 Rewrite to use common namespace for openmeetings app related metrics. c9858af is described below commit c9858af621a6459b4e9e9fc1478c3e7aaa639255 Author: Sebastian Wagner AuthorDate: Thu Feb 4 18:30:15 2021 +1300 OPENMEETINGS-2567 Rewrite to use common namespace for openmeetings app related metrics. --- .../main/java/org/apache/openmeetings}/util/logging/PrometheusAspect.java | 0 .../src/main/java/org/apache/openmeetings}/util/logging/Timed.java| 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/logging/PrometheusAspect.java similarity index 100% rename from openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java rename to openmeetings-util/src/main/java/org/apache/openmeetings/util/logging/PrometheusAspect.java diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/Timed.java b/openmeetings-util/src/main/java/org/apache/openmeetings/util/logging/Timed.java similarity index 100% rename from openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/Timed.java rename to openmeetings-util/src/main/java/org/apache/openmeetings/util/logging/Timed.java
[jira] [Commented] (OPENMEETINGS-2569) Error in rooms
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2569?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278525#comment-17278525
]
Ali Alhaidary commented on OPENMEETINGS-2569:
-
!error.png!
> Error in rooms
> --
>
> Key: OPENMEETINGS-2569
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2569
> Project: Openmeetings
> Issue Type: Bug
> Components: Audio/Video, UI, Usability
>Affects Versions: 6.0.0
> Environment: windows xp, ff 52.9.0 (32-bit)
>Reporter: Ali Alhaidary
>Assignee: Maxim Solodovnik
>Priority: Blocker
> Attachments: error.png
>
>
> Content Security Policy: Ignoring
> “[https://www.googletagmanager.com”|https://www.googletagmanager.xn--com-9o0a/]
> within script-src: ‘strict-dynamic’ specified (unknown)
> Content Security Policy: Directive ‘frame-src’ has been deprecated. Please
> use directive ‘child-src’ instead. (unknown)
> JQMIGRATE: Logging is active jquery-migrate-1.3.0-ver-1579705815000.js:23:2
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./?2-1.0-", dep: Array[1], ep: Array[0], c: Window →
> openmeetings, e: Array[1], ch: "0|s", wr: true, dt: "xml", m: "GET", async:
> true, 4 more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
> Channel '0' is busy - scheduling the callback to be executed when the
> previous request finish. wicket-ajax-jquery-ver-1579705815000.js:207:5
> Received ajax response (69 characters)
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> Calling postponed function... wicket-ajax-jquery-ver-1579705815000.js:207:5
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./?2-1.1-", c: Window → openmeetings, e: Array[1], ch: "0|s",
> wr: true, dt: "xml", m: "GET", async: true, rt: 0, pd: false, 2 more… }
> wicket-ajax-jquery-ver-1579705815000.js:201:5
> focus set on 'undefined' wicket-ajax-jquery-ver-1579705815000.js:207:5
> Received ajax response (36749 characters)
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./.?2-1.0-main~container", c: "main_container30", e: Array[1],
> ch: "0|s", wr: true, dt: "xml", m: "GET", async: true, rt: 0, pd: false, 2
> more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
> Channel '0' is busy - scheduling the callback to be executed when the
> previous request finish. wicket-ajax-jquery-ver-1579705815000.js:207:5
> Received ajax response (382 characters)
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> Calling postponed function... wicket-ajax-jquery-ver-1579705815000.js:207:5
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./.?2-1.0-main~container-main", c: "main4b", dep: Array[1], e:
> Array[1], ch: "0|s", wr: true, dt: "xml", m: "GET", async: true, rt: 0, 3
> more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
> Received ajax response (69 characters)
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> [WebSocket.send] Sending: socketConnected
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> Content Security Policy: The page’s settings blocked the loading of a
> resource at self (“style-src 'nonce-IWx2ojeL3_hOeIJGkAHiuA23'
> [https://fonts.googleapis.com/css”|https://fonts.googleapis.com/css%E2%80%9D]).
> Source:
> .dashboard .column \{width: 50.0%;}. openmeetings:1
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> focus set on 'btn72' wicket-ajax-jquery-ver-1579705815000.js:207:5
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./.?2-1.0-main~container-main-conte…", c: "btn72", e: Array[1],
> event: Object, ch:
[jira] [Created] (OPENMEETINGS-2569) Error in rooms
Ali Alhaidary created OPENMEETINGS-2569:
---
Summary: Error in rooms
Key: OPENMEETINGS-2569
URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2569
Project: Openmeetings
Issue Type: Bug
Components: Audio/Video, UI, Usability
Affects Versions: 6.0.0
Environment: windows xp, ff 52.9.0 (32-bit)
Reporter: Ali Alhaidary
Assignee: Maxim Solodovnik
Attachments: error.png
Content Security Policy: Ignoring
“[https://www.googletagmanager.com”|https://www.googletagmanager.xn--com-9o0a/]
within script-src: ‘strict-dynamic’ specified (unknown)
Content Security Policy: Directive ‘frame-src’ has been deprecated. Please use
directive ‘child-src’ instead. (unknown)
JQMIGRATE: Logging is active jquery-migrate-1.3.0-ver-1579705815000.js:23:2
Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
Object \{ u: "./?2-1.0-", dep: Array[1], ep: Array[0], c: Window →
openmeetings, e: Array[1], ch: "0|s", wr: true, dt: "xml", m: "GET", async:
true, 4 more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
Channel '0' is busy - scheduling the callback to be executed when the previous
request finish. wicket-ajax-jquery-ver-1579705815000.js:207:5
Received ajax response (69 characters)
wicket-ajax-jquery-ver-1579705815000.js:207:5
XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
Response processed successfully. wicket-ajax-jquery-ver-1579705815000.js:207:5
refocus last focused component not needed/allowed
wicket-ajax-jquery-ver-1579705815000.js:207:5
Calling postponed function... wicket-ajax-jquery-ver-1579705815000.js:207:5
Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
Object \{ u: "./?2-1.1-", c: Window → openmeetings, e: Array[1], ch: "0|s", wr:
true, dt: "xml", m: "GET", async: true, rt: 0, pd: false, 2 more… }
wicket-ajax-jquery-ver-1579705815000.js:201:5
focus set on 'undefined' wicket-ajax-jquery-ver-1579705815000.js:207:5
Received ajax response (36749 characters)
wicket-ajax-jquery-ver-1579705815000.js:207:5
XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
Response processed successfully. wicket-ajax-jquery-ver-1579705815000.js:207:5
refocus last focused component not needed/allowed
wicket-ajax-jquery-ver-1579705815000.js:207:5
Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
Object \{ u: "./.?2-1.0-main~container", c: "main_container30", e: Array[1],
ch: "0|s", wr: true, dt: "xml", m: "GET", async: true, rt: 0, pd: false, 2
more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
Channel '0' is busy - scheduling the callback to be executed when the previous
request finish. wicket-ajax-jquery-ver-1579705815000.js:207:5
Received ajax response (382 characters)
wicket-ajax-jquery-ver-1579705815000.js:207:5
XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
Response processed successfully. wicket-ajax-jquery-ver-1579705815000.js:207:5
refocus last focused component not needed/allowed
wicket-ajax-jquery-ver-1579705815000.js:207:5
Calling postponed function... wicket-ajax-jquery-ver-1579705815000.js:207:5
Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
Object \{ u: "./.?2-1.0-main~container-main", c: "main4b", dep: Array[1], e:
Array[1], ch: "0|s", wr: true, dt: "xml", m: "GET", async: true, rt: 0, 3 more…
} wicket-ajax-jquery-ver-1579705815000.js:201:5
Received ajax response (69 characters)
wicket-ajax-jquery-ver-1579705815000.js:207:5
XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
Response processed successfully. wicket-ajax-jquery-ver-1579705815000.js:207:5
refocus last focused component not needed/allowed
wicket-ajax-jquery-ver-1579705815000.js:207:5
[WebSocket.send] Sending: socketConnected
wicket-ajax-jquery-ver-1579705815000.js:207:5
Content Security Policy: The page’s settings blocked the loading of a resource
at self (“style-src 'nonce-IWx2ojeL3_hOeIJGkAHiuA23'
[https://fonts.googleapis.com/css”|https://fonts.googleapis.com/css%E2%80%9D]).
Source:
.dashboard .column \{width: 50.0%;}. openmeetings:1
Response processed successfully. wicket-ajax-jquery-ver-1579705815000.js:207:5
refocus last focused component not needed/allowed
wicket-ajax-jquery-ver-1579705815000.js:207:5
focus set on 'btn72' wicket-ajax-jquery-ver-1579705815000.js:207:5
Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
Object \{ u: "./.?2-1.0-main~container-main-conte…", c: "btn72", e: Array[1],
event: Object, ch: "0|s", wr: true, dt: "xml", m: "GET", async: true, rt: 0, 3
more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
Received ajax response (128986 characters)
wicket-ajax-jquery-ver-1579705815000.js:207:5
XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
SyntaxError: bad method definition wb-ver-1579705815000.js:50217:8
JQMIGRATE: jQuery.support.boxModel is
[jira] [Updated] (OPENMEETINGS-2569) Error in rooms
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2569?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Ali Alhaidary updated OPENMEETINGS-2569:
Attachment: error.png
> Error in rooms
> --
>
> Key: OPENMEETINGS-2569
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2569
> Project: Openmeetings
> Issue Type: Bug
> Components: Audio/Video, UI, Usability
>Affects Versions: 6.0.0
> Environment: windows xp, ff 52.9.0 (32-bit)
>Reporter: Ali Alhaidary
>Assignee: Maxim Solodovnik
>Priority: Blocker
> Attachments: error.png
>
>
> Content Security Policy: Ignoring
> “[https://www.googletagmanager.com”|https://www.googletagmanager.xn--com-9o0a/]
> within script-src: ‘strict-dynamic’ specified (unknown)
> Content Security Policy: Directive ‘frame-src’ has been deprecated. Please
> use directive ‘child-src’ instead. (unknown)
> JQMIGRATE: Logging is active jquery-migrate-1.3.0-ver-1579705815000.js:23:2
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./?2-1.0-", dep: Array[1], ep: Array[0], c: Window →
> openmeetings, e: Array[1], ch: "0|s", wr: true, dt: "xml", m: "GET", async:
> true, 4 more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
> Channel '0' is busy - scheduling the callback to be executed when the
> previous request finish. wicket-ajax-jquery-ver-1579705815000.js:207:5
> Received ajax response (69 characters)
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> Calling postponed function... wicket-ajax-jquery-ver-1579705815000.js:207:5
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./?2-1.1-", c: Window → openmeetings, e: Array[1], ch: "0|s",
> wr: true, dt: "xml", m: "GET", async: true, rt: 0, pd: false, 2 more… }
> wicket-ajax-jquery-ver-1579705815000.js:201:5
> focus set on 'undefined' wicket-ajax-jquery-ver-1579705815000.js:207:5
> Received ajax response (36749 characters)
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./.?2-1.0-main~container", c: "main_container30", e: Array[1],
> ch: "0|s", wr: true, dt: "xml", m: "GET", async: true, rt: 0, pd: false, 2
> more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
> Channel '0' is busy - scheduling the callback to be executed when the
> previous request finish. wicket-ajax-jquery-ver-1579705815000.js:207:5
> Received ajax response (382 characters)
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> Calling postponed function... wicket-ajax-jquery-ver-1579705815000.js:207:5
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./.?2-1.0-main~container-main", c: "main4b", dep: Array[1], e:
> Array[1], ch: "0|s", wr: true, dt: "xml", m: "GET", async: true, rt: 0, 3
> more… } wicket-ajax-jquery-ver-1579705815000.js:201:5
> Received ajax response (69 characters)
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> XMLDocument wicket-ajax-jquery-ver-1579705815000.js:201:5
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> [WebSocket.send] Sending: socketConnected
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> Content Security Policy: The page’s settings blocked the loading of a
> resource at self (“style-src 'nonce-IWx2ojeL3_hOeIJGkAHiuA23'
> [https://fonts.googleapis.com/css”|https://fonts.googleapis.com/css%E2%80%9D]).
> Source:
> .dashboard .column \{width: 50.0%;}. openmeetings:1
> Response processed successfully.
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> refocus last focused component not needed/allowed
> wicket-ajax-jquery-ver-1579705815000.js:207:5
> focus set on 'btn72' wicket-ajax-jquery-ver-1579705815000.js:207:5
> Executing Ajax request wicket-ajax-jquery-ver-1579705815000.js:207:5
> Object \{ u: "./.?2-1.0-main~container-main-conte…", c: "btn72", e: Array[1],
> event: Object, ch: "0|s", wr: true, dt: "xml", m:
[jira] [Created] (OPENMEETINGS-2568) email notification
Ali Alhaidary created OPENMEETINGS-2568: --- Summary: email notification Key: OPENMEETINGS-2568 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2568 Project: Openmeetings Issue Type: Improvement Components: Notifications Affects Versions: 6.0.0 Reporter: Ali Alhaidary Assignee: Maxim Solodovnik True that email is more of off-line, however, it is used for notification for most of our applications to users, SMS are used for urgent issues. Social media application has been avoided by most corporations as they do not control/supervise them, while emails usually is sent by their mail servers. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2567) Investigate Performance logging options
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2567?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278504#comment-17278504 ] ASF subversion and git services commented on OPENMEETINGS-2567: --- Commit 4e97c82b367a3400b29e8322107de6f8f3b9bd52 in openmeetings's branch refs/heads/feature/OPENMEETINGS-2567-investigate-performance-monitoring from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=4e97c82 ] OPENMEETINGS-2567 Fix Timer and settings for it. > Investigate Performance logging options > --- > > Key: OPENMEETINGS-2567 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2567 > Project: Openmeetings > Issue Type: Task > Components: Performance >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > > A placeholder Jira to log changes around investigating performance logging > options. > Investigation happen in branch, but still good to have Jira to log commits in > it. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2567) Investigate Performance logging options
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2567?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278503#comment-17278503 ] ASF subversion and git services commented on OPENMEETINGS-2567: --- Commit a4db277481e195307e080140e64c172a0679b428 in openmeetings's branch refs/heads/feature/OPENMEETINGS-2567-investigate-performance-monitoring from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=a4db277 ] OPENMEETINGS-2567 Enable annotation based AOP style attributes for Spring Managed beans. > Investigate Performance logging options > --- > > Key: OPENMEETINGS-2567 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2567 > Project: Openmeetings > Issue Type: Task > Components: Performance >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > > A placeholder Jira to log changes around investigating performance logging > options. > Investigation happen in branch, but still good to have Jira to log commits in > it. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] 02/02: OPENMEETINGS-2567 Fix Timer and settings for it.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2567-investigate-performance-monitoring
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 4e97c82b367a3400b29e8322107de6f8f3b9bd52
Author: Sebastian Wagner
AuthorDate: Thu Feb 4 16:05:58 2021 +1300
OPENMEETINGS-2567 Fix Timer and settings for it.
---
openmeetings-core/pom.xml | 4 +++
.../core/util/logging/PrometheusAspect.java| 42 ++
openmeetings-web/pom.xml | 4 +--
3 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 8c59f0e..617b3ae 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -109,6 +109,10 @@
1.9.6
+ io.prometheus
+ simpleclient
+
+
org.kurento
kurento-client
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java
index af4c97a..7fef622 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java
@@ -19,32 +19,46 @@
*/
package org.apache.openmeetings.core.util.logging;
+import java.util.HashMap;
+
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
+import io.prometheus.client.Summary;
+
@Aspect
@Component
public class PrometheusAspect {
- private static final Logger log =
LoggerFactory.getLogger(PrometheusAspect.class);
+ private final HashMap summaries = new HashMap();
+
+ private Summary getSummary(String className, String methodName) {
+ String key = className + "_" + methodName;
+ Summary sum = summaries.get(key);
+ if (sum != null) {
+ return sum;
+ }
+ sum = Summary.build() //
+ .name(key) //
+ .help(key) //
+ .register();
+ summaries.put(key, sum);
+ return sum;
+ }
@Around("@annotation(Timed)")
public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws
Throwable {
- final long start = System.currentTimeMillis();
-
- final Object proceed = joinPoint.proceed();
-
- final long executionTime = System.currentTimeMillis() - start;
-
- log.warn(joinPoint.getSignature() + "
# executed in " + executionTime + "ms");
- System.out.println(
- joinPoint.getSignature() + "
# executed in " + executionTime + "ms");
-
- return proceed;
+ String className =
joinPoint.getSignature().getDeclaringType().getSimpleName();
+ String methodName = joinPoint.getSignature().getName();
+ Summary sum = getSummary(className, methodName);
+ Summary.Timer requestTimer = sum.startTimer();
+ try {
+ return joinPoint.proceed();
+ } finally {
+ requestTimer.observeDuration();
+ }
}
}
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index 81a582f..cf2b828 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -37,8 +37,8 @@
mysql
mysql
- om_db_admin
- 12345
+ root
+
[openmeetings] 01/02: OPENMEETINGS-2567 Enable annotation based AOP style attributes for Spring Managed beans.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2567-investigate-performance-monitoring
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit a4db277481e195307e080140e64c172a0679b428
Author: Sebastian Wagner
AuthorDate: Thu Feb 4 14:34:28 2021 +1300
OPENMEETINGS-2567 Enable annotation based AOP style attributes for Spring
Managed beans.
---
openmeetings-core/pom.xml | 9
.../openmeetings/core/remote/StreamProcessor.java | 2 +
.../core/util/logging/PrometheusAspect.java| 50 ++
.../openmeetings/core/util/logging/Timed.java | 31 ++
.../web/util/logging/TomcatGenericExports.java | 19
.../webapp/WEB-INF/classes/applicationContext.xml | 3 ++
pom.xml| 11 +
7 files changed, 125 insertions(+)
diff --git a/openmeetings-core/pom.xml b/openmeetings-core/pom.xml
index 217fa9e..8c59f0e 100644
--- a/openmeetings-core/pom.xml
+++ b/openmeetings-core/pom.xml
@@ -100,6 +100,15 @@
${spring.version}
+ org.springframework
+ spring-aop
+
+
+ org.aspectj
+ aspectjtools
+ 1.9.6
+
+
org.kurento
kurento-client
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
index be483e0..0355abe 100644
---
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/StreamProcessor.java
@@ -38,6 +38,7 @@ import
org.apache.openmeetings.core.converter.IRecordingConverter;
import org.apache.openmeetings.core.converter.InterviewConverter;
import org.apache.openmeetings.core.converter.RecordingConverter;
import org.apache.openmeetings.core.util.WebSocketHelper;
+import org.apache.openmeetings.core.util.logging.Timed;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.basic.Client.Activity;
@@ -83,6 +84,7 @@ public class StreamProcessor implements IStreamProcessor {
@Autowired
private InterviewConverter interviewConverter;
+ @Timed
void onMessage(Client c, final String cmdId, JSONObject msg) {
final String uid = msg.optString("uid");
KStream sender;
diff --git
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java
new file mode 100644
index 000..af4c97a
--- /dev/null
+++
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java
@@ -0,0 +1,50 @@
+/*
+
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.core.util.logging;
+
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+@Aspect
+@Component
+public class PrometheusAspect {
+
+ private static final Logger log =
LoggerFactory.getLogger(PrometheusAspect.class);
+
+ @Around("@annotation(Timed)")
+ public Object logExecutionTime(ProceedingJoinPoint joinPoint) throws
Throwable {
+ final long start = System.currentTimeMillis();
+
+ final Object proceed = joinPoint.proceed();
+
+ final long executionTime = System.currentTimeMillis() - start;
+
+ log.warn(joinPoint.getSignature() + "
# executed in " + executionTime + "ms");
+ System.out.println(
+
[openmeetings] branch feature/OPENMEETINGS-2567-investigate-performance-monitoring updated (8c44176 -> 4e97c82)
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a change to branch
feature/OPENMEETINGS-2567-investigate-performance-monitoring
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
from 8c44176 OPENMEETINGS-2567 Add metrics for Room enter to measure
performance.
new a4db277 OPENMEETINGS-2567 Enable annotation based AOP style
attributes for Spring Managed beans.
new 4e97c82 OPENMEETINGS-2567 Fix Timer and settings for it.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
openmeetings-core/pom.xml | 13 +
.../openmeetings/core/remote/StreamProcessor.java | 2 +
.../core/util/logging/PrometheusAspect.java| 64 ++
.../openmeetings/core/util/logging/Timed.java} | 17 +++---
openmeetings-web/pom.xml | 4 +-
.../web/util/logging/TomcatGenericExports.java | 19 +++
.../webapp/WEB-INF/classes/applicationContext.xml | 3 +
pom.xml| 11
8 files changed, 123 insertions(+), 10 deletions(-)
create mode 100644
openmeetings-core/src/main/java/org/apache/openmeetings/core/util/logging/PrometheusAspect.java
copy openmeetings-core/src/{test/java/org/apache/openmeetings/gui/TestGui.java
=> main/java/org/apache/openmeetings/core/util/logging/Timed.java} (72%)
[jira] [Commented] (OPENMEETINGS-2567) Investigate Performance logging options
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2567?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278344#comment-17278344 ] ASF subversion and git services commented on OPENMEETINGS-2567: --- Commit 8c441764d59d5d8503e1dd70019cb4a07eb4ffe2 in openmeetings's branch refs/heads/feature/OPENMEETINGS-2567-investigate-performance-monitoring from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=8c44176 ] OPENMEETINGS-2567 Add metrics for Room enter to measure performance. > Investigate Performance logging options > --- > > Key: OPENMEETINGS-2567 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2567 > Project: Openmeetings > Issue Type: Task > Components: Performance >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Major > > A placeholder Jira to log changes around investigating performance logging > options. > Investigation happen in branch, but still good to have Jira to log commits in > it. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch feature/OPENMEETINGS-2567-investigate-performance-monitoring updated (e2e2cd5 -> 8c44176)
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a change to branch feature/OPENMEETINGS-2567-investigate-performance-monitoring in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from e2e2cd5 OPENMEETINGS-2567 Enable basic Prometheus JVM statistics. new 1f031ce HOS-241 Fix register servlet for measuring call length. new 8c44176 OPENMEETINGS-2567 Add metrics for Room enter to measure performance. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../apache/openmeetings/web/room/RoomPanel.java| 408 +++-- openmeetings-web/src/main/webapp/WEB-INF/web.xml | 5 + 2 files changed, 225 insertions(+), 188 deletions(-)
[openmeetings] 01/02: HOS-241 Fix register servlet for measuring call length.
This is an automated email from the ASF dual-hosted git repository. sebawagner pushed a commit to branch feature/OPENMEETINGS-2567-investigate-performance-monitoring in repository https://gitbox.apache.org/repos/asf/openmeetings.git commit 1f031ce2b88b11f87b6c0d783b3c42674d36f058 Author: Sebastian Wagner AuthorDate: Wed Feb 3 19:41:07 2021 +1300 HOS-241 Fix register servlet for measuring call length. --- openmeetings-web/src/main/webapp/WEB-INF/web.xml | 5 + 1 file changed, 5 insertions(+) diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml index 265231f..c479f1a 100644 --- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml +++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml @@ -79,6 +79,11 @@ + prometheusFilter + /* + + + OpenmeetingsApplication /*
[openmeetings] 02/02: OPENMEETINGS-2567 Add metrics for Room enter to measure performance.
This is an automated email from the ASF dual-hosted git repository.
sebawagner pushed a commit to branch
feature/OPENMEETINGS-2567-investigate-performance-monitoring
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 8c441764d59d5d8503e1dd70019cb4a07eb4ffe2
Author: Sebastian Wagner
AuthorDate: Thu Feb 4 09:19:13 2021 +1300
OPENMEETINGS-2567 Add metrics for Room enter to measure performance.
---
.../apache/openmeetings/web/room/RoomPanel.java| 408 +++--
1 file changed, 220 insertions(+), 188 deletions(-)
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 f79c1bb..3cea173 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
@@ -117,6 +117,8 @@ import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Alert;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal.Backdrop;
import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.TextContentModal;
+import io.prometheus.client.SimpleTimer;
+import io.prometheus.client.Summary;
@AuthorizeInstantiation("ROOM")
public class RoomPanel extends BasePanel {
@@ -134,67 +136,92 @@ public class RoomPanel extends BasePanel {
private final Room r;
private final boolean interview;
private final WebMarkupContainer room = new
WebMarkupContainer("roomContainer");
+ static final Summary metric_roomPanel_init = Summary.build() //
+ .name("requests_roomPanel_init") //
+ .help("Request latency in seconds.") //
+ .labelNames("aLabel") //
+ .register();
+ static final Summary metric_roomPanel_roomEnter = Summary.build() //
+ .name("requests_roomPanel_room_enter") //
+ .help("Request latency in seconds.") //
+ .labelNames("aLabel") //
+ .register();
+ static final Summary metric_roomPanel_initVideo = Summary.build() //
+ .name("requests_roomPanel_init_video") //
+ .help("Request latency in seconds.") //
+ .labelNames("aLabel") //
+ .register();
private final AbstractDefaultAjaxBehavior roomEnter = new
AbstractDefaultAjaxBehavior() {
private static final long serialVersionUID = 1L;
@Override
protected void respond(AjaxRequestTarget target) {
- log.debug("RoomPanel::roomEnter");
- WebSession ws = WebSession.get();
- Client c = getClient();
- JSONObject options =
VideoSettings.getInitJson(c.getSid())
- .put("uid", c.getUid())
- .put("userId", c.getUserId())
- .put("rights",
c.toJson(true).getJSONArray("rights"))
- .put("interview", interview)
- .put("audioOnly", r.isAudioOnly())
- .put("allowRecording",
r.isAllowRecording())
- .put("questions",
r.isAllowUserQuestions())
- .put("showMicStatus",
!r.getHiddenElements().contains(RoomElement.MICROPHONE_STATUS));
- if (!Strings.isEmpty(r.getRedirectURL()) &&
(ws.getSoapLogin() != null || ws.getInvitation() != null)) {
- options.put("reloadUrl", r.getRedirectURL());
- }
- StringBuilder sb = new
StringBuilder("Room.init(").append(options.toString(new
NullStringer())).append(");")
- .append(wb.getInitScript())
- .append(getQuickPollJs());
- sb.append(sendClientsOnInit());
- target.appendJavaScript(sb);
-
- WebSocketHelper.sendRoom(new TextRoomMessage(r.getId(),
c, RoomMessage.Type.ROOM_ENTER, c.getUid()));
- // play video from other participants
- initVideos(target);
- getMainPanel().getChat().roomEnter(r, target);
- if (r.isFilesOpened()) {
- sidebar.setFilesActive(target);
- }
- if (Room.Type.PRESENTATION != r.getType()) {
- boolean modsEmpty = noModerators();
- log.debug("RoomPanel::roomEnter, mods IS EMPTY
? {}, is MOD ? {}",
[jira] [Commented] (OPENMEETINGS-2519) (6.0.0) Library versions need to be updated
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2519?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278136#comment-17278136 ] ASF subversion and git services commented on OPENMEETINGS-2519: --- Commit e7871b4471de777fd08342ae037c21806ac08598 in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=e7871b4 ] [OPENMEETINGS-2519] tomcat, jjodconverter, xstream, mockito, cxf, DB drivers > (6.0.0) Library versions need to be updated > --- > > Key: OPENMEETINGS-2519 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2519 > Project: Openmeetings > Issue Type: Task > Components: Builds >Affects Versions: 6.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 6.0.0 > > > Library versions need to be updated -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2519] tomcat, jjodconverter, xstream, mockito, cxf, DB drivers
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 e7871b4 [OPENMEETINGS-2519] tomcat, jjodconverter, xstream, mockito,
cxf, DB drivers
e7871b4 is described below
commit e7871b4471de777fd08342ae037c21806ac08598
Author: Maxim Solodovnik
AuthorDate: Wed Feb 3 23:26:06 2021 +0700
[OPENMEETINGS-2519] tomcat, jjodconverter, xstream, mockito, cxf, DB drivers
---
openmeetings-server/pom.xml | 2 +-
pom.xml | 25 +
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/openmeetings-server/pom.xml b/openmeetings-server/pom.xml
index 5269b2a..db7c38e 100644
--- a/openmeetings-server/pom.xml
+++ b/openmeetings-server/pom.xml
@@ -119,7 +119,7 @@
prepare-web-server
-
web-server/apache-tomcat-9.0.41.tar.gz
+
web-server/apache-tomcat-9.0.43.tar.gz
diff --git a/pom.xml b/pom.xml
index 2064743..1062d56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
5.1.1
3.3.1
3.1.0
- 2.0.0
+ 2.0.2
3.0.0
3.2.0
1.5.3
@@ -71,7 +71,7 @@
0.13
1.5
3.0.0
-
3.7.0.1746
+
3.8.0.2131
0.8.6
3.1
3.1.1
@@ -79,14 +79,14 @@
5.7.0
9.2.0
- 9.1.0
+ 9.2.0
9.2.0
5.0.3
- 5.15.1
- 5.3.2
- 9.0.41
+ 5.15.2
+ 5.3.3
+ 9.0.43
3.0.18
- 3.4.1
+ 3.4.2
2.7.1
1.4.1
${project.basedir}
@@ -103,11 +103,11 @@
1.15
2.8.0
42.2.18
- 8.0.22
- 8.4.1.jre11
+ 8.0.23
+ 9.2.0.jre11
19.9.0.0
4.4
- 1.4.14
+ 1.4.15
2.0.1
1.0.1
1.25
@@ -117,11 +117,12 @@
9.4.34.v20201102
test
1.68
- 3.6.28
+ 3.7.7
2.3.2
6.15.0
1.2.307
3.1.3-2
+ 4.4.0
file:**/generated-sources/**,
file:**/jquery-ui.css, file:**/cssemoticons.js,
file:**/bootstrap-confirmation.js
jacoco
@@ -633,7 +634,7 @@
org.jodconverter
jodconverter-local
- 4.3.0
+ ${jodconverter.version}
org.asteriskjava
[jira] [Commented] (OPENMEETINGS-2551) There should be way to limit NetTest client count
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2551?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278021#comment-17278021 ] ASF subversion and git services commented on OPENMEETINGS-2551: --- Commit 48859faa98a14d6092ebea4e36354039481479ff in openmeetings's branch refs/heads/master from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=48859fa ] [OPENMEETINGS-2551] code clean-up > There should be way to limit NetTest client count > - > > Key: OPENMEETINGS-2551 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2551 > Project: Openmeetings > Issue Type: Improvement > Components: Testing-Tool >Affects Versions: 5.1.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik >Priority: Major > Fix For: 6.0.0 > > > Currently there can be unlimited clients of Network testing tool > It should be possible to limit -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated: [OPENMEETINGS-2551] code clean-up
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 48859fa [OPENMEETINGS-2551] code clean-up
48859fa is described below
commit 48859faa98a14d6092ebea4e36354039481479ff
Author: Maxim Solodovnik
AuthorDate: Wed Feb 3 20:52:50 2021 +0700
[OPENMEETINGS-2551] code clean-up
---
.../java/org/apache/openmeetings/webservice/NetTestWebService.java | 6 +-
.../apache/openmeetings/webservice/util/RateLimitRequestFilter.java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
index 44f0b50..b95c25c 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/NetTestWebService.java
@@ -57,7 +57,7 @@ public class NetTestWebService {
private static final int JITTER_PACKET_SIZE = 1024;
private static final int MAX_UPLOAD_SIZE = 16 * 1024 * 1024;
public static final AtomicInteger CLIENT_COUNT = new AtomicInteger();
- public static int maxClients = 100;
+ private static int maxClients = 100;
@PostConstruct
private void report() {
@@ -160,4 +160,8 @@ public class NetTestWebService {
private void setMaxClients(int count) {
maxClients = count;
}
+
+ public static int getMaxClients() {
+ return maxClients;
+ }
}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/RateLimitRequestFilter.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/RateLimitRequestFilter.java
index 2d071c2..50352cb 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/RateLimitRequestFilter.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/util/RateLimitRequestFilter.java
@@ -56,7 +56,7 @@ public class RateLimitRequestFilter implements
ContainerRequestFilter {
return;
}
}
- if (NetTestWebService.CLIENT_COUNT.get() >
NetTestWebService.maxClients) {
+ if (NetTestWebService.CLIENT_COUNT.get() >
NetTestWebService.getMaxClients()) {
log.error("Download: Max client count reached");
context.abortWith(Response.status(Status.TOO_MANY_REQUESTS).build());
return;
[jira] [Resolved] (OPENMEETINGS-2239) (Re-) Implementation SIP (audio only)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2239?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-2239. Resolution: Fixed > (Re-) Implementation SIP (audio only) > - > > Key: OPENMEETINGS-2239 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2239 > Project: Openmeetings > Issue Type: Wish > Components: VoIP/SIP >Affects Versions: 5.0.0-M3 >Reporter: Rene Scholz >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 6.0.0 > > > In OM5 the SIP is no longer working - please "reactivate" ist. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Updated] (OPENMEETINGS-2239) (Re-) Implementation SIP (audio only)
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2239?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik updated OPENMEETINGS-2239: --- Summary: (Re-) Implementation SIP (audio only) (was: (Re-) Implementation SIP) > (Re-) Implementation SIP (audio only) > - > > Key: OPENMEETINGS-2239 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2239 > Project: Openmeetings > Issue Type: Wish > Components: VoIP/SIP >Affects Versions: 5.0.0-M3 >Reporter: Rene Scholz >Assignee: Maxim Solodovnik >Priority: Critical > Fix For: 6.0.0 > > > In OM5 the SIP is no longer working - please "reactivate" ist. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2560) Improve WebService response for UserWebService
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2560?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278003#comment-17278003 ] ASF subversion and git services commented on OPENMEETINGS-2560: --- Commit fc322813eff4eb2ab0757b1b11e87d0b0290713b in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fc32281 ] OPENMEETINGS-2560 Improve response to return the actual error to client. (#121) * OPENMEETINGS-2560 Improve response to return the actual error to client. * [OPENMEETINGS-2560] ServiceException is not runtime anymore Co-authored-by: Maxim Solodovnik > Improve WebService response for UserWebService > -- > > Key: OPENMEETINGS-2560 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2560 > Project: Openmeetings > Issue Type: Task > Components: SOAP/REST API >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Minor > Fix For: 6.0.0 > > > Currently no error is returned to the client, since the exception is not > mapped into the response method signature. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2560) Improve WebService response for UserWebService
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2560?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278005#comment-17278005 ] ASF subversion and git services commented on OPENMEETINGS-2560: --- Commit fc322813eff4eb2ab0757b1b11e87d0b0290713b in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fc32281 ] OPENMEETINGS-2560 Improve response to return the actual error to client. (#121) * OPENMEETINGS-2560 Improve response to return the actual error to client. * [OPENMEETINGS-2560] ServiceException is not runtime anymore Co-authored-by: Maxim Solodovnik > Improve WebService response for UserWebService > -- > > Key: OPENMEETINGS-2560 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2560 > Project: Openmeetings > Issue Type: Task > Components: SOAP/REST API >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Minor > Fix For: 6.0.0 > > > Currently no error is returned to the client, since the exception is not > mapped into the response method signature. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2560) Improve WebService response for UserWebService
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2560?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278002#comment-17278002 ] ASF subversion and git services commented on OPENMEETINGS-2560: --- Commit 6d87bb0a49311309423d29dfd185c17a8a74ce29 in openmeetings's branch refs/heads/feature/OPENMEETINGS-2560-improve-api-error-response from Maxim Solodovnik [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=6d87bb0 ] [OPENMEETINGS-2560] ServiceException is not runtime anymore > Improve WebService response for UserWebService > -- > > Key: OPENMEETINGS-2560 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2560 > Project: Openmeetings > Issue Type: Task > Components: SOAP/REST API >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Minor > Fix For: 6.0.0 > > > Currently no error is returned to the client, since the exception is not > mapped into the response method signature. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2560) Improve WebService response for UserWebService
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2560?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17278004#comment-17278004 ] ASF subversion and git services commented on OPENMEETINGS-2560: --- Commit fc322813eff4eb2ab0757b1b11e87d0b0290713b in openmeetings's branch refs/heads/master from Sebastian Wagner [ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=fc32281 ] OPENMEETINGS-2560 Improve response to return the actual error to client. (#121) * OPENMEETINGS-2560 Improve response to return the actual error to client. * [OPENMEETINGS-2560] ServiceException is not runtime anymore Co-authored-by: Maxim Solodovnik > Improve WebService response for UserWebService > -- > > Key: OPENMEETINGS-2560 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2560 > Project: Openmeetings > Issue Type: Task > Components: SOAP/REST API >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Minor > Fix For: 6.0.0 > > > Currently no error is returned to the client, since the exception is not > mapped into the response method signature. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch feature/OPENMEETINGS-2560-improve-api-error-response updated (212b360 -> 6d87bb0)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch feature/OPENMEETINGS-2560-improve-api-error-response in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 212b360 OPENMEETINGS-2560 Improve response to return the actual error to client. add 6d87bb0 [OPENMEETINGS-2560] ServiceException is not runtime anymore No new revisions were added by this update. Summary of changes: .../openmeetings/webservice/BaseWebService.java| 6 +- .../webservice/CalendarWebService.java | 42 ++--- .../openmeetings/webservice/FileWebService.java| 34 --- .../openmeetings/webservice/GroupWebService.java | 28 ++--- .../webservice/RecordingWebService.java| 22 +-- .../openmeetings/webservice/RoomWebService.java| 71 +- .../openmeetings/webservice/UserWebService.java| 27 +--- .../openmeetings/webservice/WbWebService.java | 13 ++-- .../webservice/error/InternalServiceException.java | 6 +- .../webservice/error/ServiceException.java | 2 +- .../openmeetings/webservice/TestBaseService.java | 20 ++ 11 files changed, 194 insertions(+), 77 deletions(-) copy openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallException.java => openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/InternalServiceException.java (84%)
[jira] [Resolved] (OPENMEETINGS-2560) Improve WebService response for UserWebService
[ https://issues.apache.org/jira/browse/OPENMEETINGS-2560?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Maxim Solodovnik resolved OPENMEETINGS-2560. Resolution: Fixed > Improve WebService response for UserWebService > -- > > Key: OPENMEETINGS-2560 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2560 > Project: Openmeetings > Issue Type: Task > Components: SOAP/REST API >Affects Versions: 5.1.0 >Reporter: Sebastian Wagner >Assignee: Sebastian Wagner >Priority: Minor > Fix For: 6.0.0 > > > Currently no error is returned to the client, since the exception is not > mapped into the response method signature. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[openmeetings] branch master updated (3fd2675 -> fc32281)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from 3fd2675 OPENMEETINGS-2565 Spelling mistake in web service method (#124) add fc32281 OPENMEETINGS-2560 Improve response to return the actual error to client. (#121) No new revisions were added by this update. Summary of changes: .../openmeetings/webservice/BaseWebService.java| 6 +- .../webservice/CalendarWebService.java | 42 ++--- .../openmeetings/webservice/FileWebService.java| 34 --- .../openmeetings/webservice/GroupWebService.java | 28 ++--- .../webservice/RecordingWebService.java| 22 +-- .../openmeetings/webservice/RoomWebService.java| 71 +- .../openmeetings/webservice/UserWebService.java| 33 ++ .../openmeetings/webservice/WbWebService.java | 13 ++-- .../webservice/error/InternalServiceException.java | 6 +- .../webservice/error/ServiceException.java | 2 +- .../openmeetings/webservice/TestBaseService.java | 20 ++ 11 files changed, 197 insertions(+), 80 deletions(-) copy openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallException.java => openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/error/InternalServiceException.java (84%)
[jira] [Commented] (OPENMEETINGS-2565) Typo in RoomDTO getExternal - doesn't return correct room
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2565?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17277964#comment-17277964
]
ASF subversion and git services commented on OPENMEETINGS-2565:
---
Commit 3fd26756d2e88a5022ff3b480938f2369f61bb33 in openmeetings's branch
refs/heads/master from Sebastian Wagner
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=3fd2675 ]
OPENMEETINGS-2565 Spelling mistake in web service method (#124)
* OPENMEETINGS-2565 Spelling mistake in web service method.
* [OPENMEETINGS-2565] test is added
Co-authored-by: Maxim Solodovnik
> Typo in RoomDTO getExternal - doesn't return correct room
> -
>
> Key: OPENMEETINGS-2565
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2565
> Project: Openmeetings
> Issue Type: Bug
>Reporter: Sebastian Wagner
>Assignee: Sebastian Wagner
>Priority: Major
> Fix For: 6.0.0
>
>
> This is quite annoying.
>
> Cause it looks like its working but in fact it isnt'.
>
> {code:java}
> @WebMethod
> @GET
> @Path("/{type}/{externaltype}/{externaliid}")
> public RoomDTO getExternal(@WebParam(name="sid") @QueryParam("sid")
> String sid
> , @PathParam("type") @WebParam(name="type") String type
> , @PathParam("externaltype")
> @WebParam(name="externaltype") String externalType
> , @PathParam("externalid") @WebParam(name="externalid")
> String externalId
> , @WebParam(name="room") @QueryParam("room") RoomDTO
> room) {
> {code}
>
> externaliid == Spelled wrong and differently from
> @PathParam("externalid") @WebParam(name="externalid") String externalId
> => Effect in
> {code:java}
> Room r = roomDao.getExternal(Room.Type.valueOf(type), externalType,
> externalId);{code}
> externalId is simply null. Nothing inside. Cause the param in the header
> decoration is spelled wrongly/different.
> However it just returns the first entry based on the "externalType", which
> sometimes works, for example if you just have 1 room. But in most cases just
> doesn't work at all.
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2565) Typo in RoomDTO getExternal - doesn't return correct room
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2565?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17277961#comment-17277961
]
ASF subversion and git services commented on OPENMEETINGS-2565:
---
Commit afa5d9104b43e3fdc7feb4fcd0f7302a6f822797 in openmeetings's branch
refs/heads/feature/typo-in-get-room-by-externalid from Maxim Solodovnik
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=afa5d91 ]
[OPENMEETINGS-2565] test is added
> Typo in RoomDTO getExternal - doesn't return correct room
> -
>
> Key: OPENMEETINGS-2565
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2565
> Project: Openmeetings
> Issue Type: Bug
>Reporter: Sebastian Wagner
>Assignee: Sebastian Wagner
>Priority: Major
> Fix For: 6.0.0
>
>
> This is quite annoying.
>
> Cause it looks like its working but in fact it isnt'.
>
> {code:java}
> @WebMethod
> @GET
> @Path("/{type}/{externaltype}/{externaliid}")
> public RoomDTO getExternal(@WebParam(name="sid") @QueryParam("sid")
> String sid
> , @PathParam("type") @WebParam(name="type") String type
> , @PathParam("externaltype")
> @WebParam(name="externaltype") String externalType
> , @PathParam("externalid") @WebParam(name="externalid")
> String externalId
> , @WebParam(name="room") @QueryParam("room") RoomDTO
> room) {
> {code}
>
> externaliid == Spelled wrong and differently from
> @PathParam("externalid") @WebParam(name="externalid") String externalId
> => Effect in
> {code:java}
> Room r = roomDao.getExternal(Room.Type.valueOf(type), externalType,
> externalId);{code}
> externalId is simply null. Nothing inside. Cause the param in the header
> decoration is spelled wrongly/different.
> However it just returns the first entry based on the "externalType", which
> sometimes works, for example if you just have 1 room. But in most cases just
> doesn't work at all.
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2565) Typo in RoomDTO getExternal - doesn't return correct room
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2565?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17277962#comment-17277962
]
ASF subversion and git services commented on OPENMEETINGS-2565:
---
Commit 3fd26756d2e88a5022ff3b480938f2369f61bb33 in openmeetings's branch
refs/heads/master from Sebastian Wagner
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=3fd2675 ]
OPENMEETINGS-2565 Spelling mistake in web service method (#124)
* OPENMEETINGS-2565 Spelling mistake in web service method.
* [OPENMEETINGS-2565] test is added
Co-authored-by: Maxim Solodovnik
> Typo in RoomDTO getExternal - doesn't return correct room
> -
>
> Key: OPENMEETINGS-2565
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2565
> Project: Openmeetings
> Issue Type: Bug
>Reporter: Sebastian Wagner
>Assignee: Sebastian Wagner
>Priority: Major
> Fix For: 6.0.0
>
>
> This is quite annoying.
>
> Cause it looks like its working but in fact it isnt'.
>
> {code:java}
> @WebMethod
> @GET
> @Path("/{type}/{externaltype}/{externaliid}")
> public RoomDTO getExternal(@WebParam(name="sid") @QueryParam("sid")
> String sid
> , @PathParam("type") @WebParam(name="type") String type
> , @PathParam("externaltype")
> @WebParam(name="externaltype") String externalType
> , @PathParam("externalid") @WebParam(name="externalid")
> String externalId
> , @WebParam(name="room") @QueryParam("room") RoomDTO
> room) {
> {code}
>
> externaliid == Spelled wrong and differently from
> @PathParam("externalid") @WebParam(name="externalid") String externalId
> => Effect in
> {code:java}
> Room r = roomDao.getExternal(Room.Type.valueOf(type), externalType,
> externalId);{code}
> externalId is simply null. Nothing inside. Cause the param in the header
> decoration is spelled wrongly/different.
> However it just returns the first entry based on the "externalType", which
> sometimes works, for example if you just have 1 room. But in most cases just
> doesn't work at all.
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Commented] (OPENMEETINGS-2565) Typo in RoomDTO getExternal - doesn't return correct room
[
https://issues.apache.org/jira/browse/OPENMEETINGS-2565?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17277963#comment-17277963
]
ASF subversion and git services commented on OPENMEETINGS-2565:
---
Commit 3fd26756d2e88a5022ff3b480938f2369f61bb33 in openmeetings's branch
refs/heads/master from Sebastian Wagner
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=3fd2675 ]
OPENMEETINGS-2565 Spelling mistake in web service method (#124)
* OPENMEETINGS-2565 Spelling mistake in web service method.
* [OPENMEETINGS-2565] test is added
Co-authored-by: Maxim Solodovnik
> Typo in RoomDTO getExternal - doesn't return correct room
> -
>
> Key: OPENMEETINGS-2565
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-2565
> Project: Openmeetings
> Issue Type: Bug
>Reporter: Sebastian Wagner
>Assignee: Sebastian Wagner
>Priority: Major
> Fix For: 6.0.0
>
>
> This is quite annoying.
>
> Cause it looks like its working but in fact it isnt'.
>
> {code:java}
> @WebMethod
> @GET
> @Path("/{type}/{externaltype}/{externaliid}")
> public RoomDTO getExternal(@WebParam(name="sid") @QueryParam("sid")
> String sid
> , @PathParam("type") @WebParam(name="type") String type
> , @PathParam("externaltype")
> @WebParam(name="externaltype") String externalType
> , @PathParam("externalid") @WebParam(name="externalid")
> String externalId
> , @WebParam(name="room") @QueryParam("room") RoomDTO
> room) {
> {code}
>
> externaliid == Spelled wrong and differently from
> @PathParam("externalid") @WebParam(name="externalid") String externalId
> => Effect in
> {code:java}
> Room r = roomDao.getExternal(Room.Type.valueOf(type), externalType,
> externalId);{code}
> externalId is simply null. Nothing inside. Cause the param in the header
> decoration is spelled wrongly/different.
> However it just returns the first entry based on the "externalType", which
> sometimes works, for example if you just have 1 room. But in most cases just
> doesn't work at all.
>
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[openmeetings] branch master updated: OPENMEETINGS-2565 Spelling mistake in web service method (#124)
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 3fd2675 OPENMEETINGS-2565 Spelling mistake in web service method
(#124)
3fd2675 is described below
commit 3fd26756d2e88a5022ff3b480938f2369f61bb33
Author: Sebastian Wagner
AuthorDate: Thu Feb 4 01:15:16 2021 +1300
OPENMEETINGS-2565 Spelling mistake in web service method (#124)
* OPENMEETINGS-2565 Spelling mistake in web service method.
* [OPENMEETINGS-2565] test is added
Co-authored-by: Maxim Solodovnik
---
.../test/java/org/apache/openmeetings/webservice/TestRoomService.java | 2 ++
.../main/java/org/apache/openmeetings/webservice/RoomWebService.java| 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
index 03a8312..2e56b5b 100644
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
+++
b/openmeetings-web/src/test/java/org/apache/openmeetings/webservice/TestRoomService.java
@@ -60,12 +60,14 @@ class TestRoomService extends AbstractWebServiceTest {
.query("room", r.toString())
.get(RoomDTO.class);
assertNotNull(room, "Valid room should be returned");
+ assertEquals(extId, room.getExternalId(), "External ID of room
should match");
assertNotNull(room.getId(), "Room ID should be not empty");
RoomDTO room1 =
getClient(getRoomUrl()).path(String.format("/%s/%s/%s", Room.Type.PRESENTATION,
UNIT_TEST_EXT_TYPE, extId))
.query("sid", sr.getMessage())
.get(RoomDTO.class);
assertNotNull(room1, "Valid room should be returned");
+ assertEquals(extId, room1.getExternalId(), "External ID of room
should match");
assertEquals(room.getId(), room1.getId(), "Same Room should be
returned");
}
diff --git
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
index d704577..ace6598 100644
---
a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
+++
b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java
@@ -164,7 +164,7 @@ public class RoomWebService extends BaseWebService {
*/
@WebMethod
@GET
- @Path("/{type}/{externaltype}/{externaliid}")
+ @Path("/{type}/{externaltype}/{externalid}")
public RoomDTO getExternal(@WebParam(name="sid") @QueryParam("sid")
String sid
, @PathParam("type") @WebParam(name="type") String type
, @PathParam("externaltype")
@WebParam(name="externaltype") String externalType
[openmeetings] branch feature/typo-in-get-room-by-externalid updated (d7f4822 -> afa5d91)
This is an automated email from the ASF dual-hosted git repository. solomax pushed a change to branch feature/typo-in-get-room-by-externalid in repository https://gitbox.apache.org/repos/asf/openmeetings.git. from d7f4822 OPENMEETINGS-2565 Spelling mistake in web service method. add afa5d91 [OPENMEETINGS-2565] test is added No new revisions were added by this update. Summary of changes: .../test/java/org/apache/openmeetings/webservice/TestRoomService.java | 2 ++ 1 file changed, 2 insertions(+)
