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 2018/03/23 11:50:29 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1855] upload
test somehow working
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 fe71f16 [OPENMEETINGS-1855] upload test somehow working
fe71f16 is described below
commit fe71f1639eed55819ebe95b01a5cf01228719f3d
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Fri Mar 23 18:50:19 2018 +0700
[OPENMEETINGS-1855] upload test somehow working
---
.../org/apache/openmeetings/web/room/NetTestPanel.html | 4 ++--
.../org/apache/openmeetings/web/room/nettest-base.js | 4 ++++
.../openmeetings/webservice/NetTestWebService.java | 18 +++++++++++-------
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
index eea2475..8853ccc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NetTestPanel.html
@@ -32,12 +32,12 @@
</button>
</div>
<div class="test">
- <button type="button" data-measure="upload" data-next="download">
+ <button type="button" data-measure="upload" data-next="download" wicket:message="data-lbl:network.test.upl">
<span class="ui-icon ui-icon-arrowthickstop-1-n"></span> <wicket:message key="network.test.upl"/>
</button>
</div>
<div class="test">
- <button type="button" data-measure="download">
+ <button type="button" data-measure="download" wicket:message="data-lbl:network.test.dwn">
<span class="ui-icon ui-icon-arrowthickstop-1-s"></span> <wicket:message key="network.test.dwn"/>
</button>
</div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
index c9a549d..72b8f3e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
@@ -27,6 +27,7 @@ var NetTest = (function() {
.on('start', _start)
.on('progress', _progress)
.on('restart', _restart)
+ .on('error', _error)
.on('end', _end);
net.download
.on('start', _start)
@@ -70,6 +71,9 @@ var NetTest = (function() {
+ ' of data...'
));
}
+ function _error() {
+ _log($('<span class="error></span>"'))
+ }
function _end(avg) {
_log('Final average speed: ' + _value(avg / 1024 / 1024, _mbps()));
_stop();
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 ccf2dfc..3c05543 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
@@ -34,7 +34,6 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
-import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -72,8 +71,8 @@ public class NetTestWebService {
@GET
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@Path("/")
- public Response get(@QueryParam("type") String type) {
- TestType testType = getTypeByString(type);
+ public Response get(@QueryParam("module") String module, @QueryParam("size") long size) {
+ TestType testType = getTypeByString(module);
log.debug("Network test:: get");
// choose data to send
@@ -95,15 +94,20 @@ public class NetTestWebService {
}
ResponseBuilder response = Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).entity(new ByteArrayInputStream(data));
- response.header("Cache-Control", "no-cache");
+ response.header("Cache-Control", "no-cache, no-store, no-transform");
+ response.header("Pragma", "no-cache");
response.header("Content-Length", String.valueOf(data.length));
return response.build();
}
@POST
- @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Consumes(MediaType.APPLICATION_OCTET_STREAM)
@Path("/")
- public void upload(@Multipart(value = "stream", type = MediaType.APPLICATION_OCTET_STREAM) InputStream stream) throws IOException {
+ public void upload(
+ @QueryParam("module") String module
+ , @QueryParam("size") long size
+ , InputStream stream) throws IOException
+ {
byte[] b = new byte[1024];
while (stream.read(b) >= 0 ) {
//no-op
@@ -113,7 +117,7 @@ public class NetTestWebService {
private static TestType getTypeByString(String typeString) {
if ("ping".equals(typeString)) {
return TestType.PING;
- } else if ("jitter".equals(typeString)) {
+ } else if ("latency".equals(typeString)) {
return TestType.JITTER;
} else if ("download".equals(typeString)) {
return TestType.DOWNLOAD_SPEED;
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.