Author: a_horuzhenko
Date: Mon May 20 06:51:01 2013
New Revision: 1484381
URL: http://svn.apache.org/r1484381
Log:
Changes from r1483678 and r1483769 have been duplicated in 3.0
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1484381&r1=1484380&r2=1484381&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Mon May 20 06:51:01 2013
@@ -209,7 +209,7 @@
<handler name="onerror" >
<![CDATA[
- if ($debug) Debug.write("error
",this.status,this.src,this.lastCalled,this.showKickMessage);
+ canvas.remoteLogWrite("error " + this.status + " " + this.src + "
" + this.lastCalled + " " + this.showKickMessage);
if (this.showFullMessage) {
new lz.labelerrorPopup(canvas,{errorlabelid:99});
this.showFullMessage = false;
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1484381&r1=1484380&r2=1484381&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Mon May
20 06:51:01 2013
@@ -114,6 +114,15 @@
]]>
</method>
+ <method name="remoteLogWrite" args="message">
+ if ($debug) Debug.write(message);
+ var remoteLog = new lz.dataset();
+ remoteLog.setQueryType("POST");
+ remoteLog.setAttribute("src", canvas.getUrl() + "/remotelog.upload");
+ remoteLog.setQueryParam("message", message);
+ remoteLog.doRequest();
+ </method>
+
<method name="getHttpHost">
<![CDATA[
if (canvas.httphostlocal != null && canvas.httphostlocal.length > 0) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java?rev=1484381&r1=1484380&r2=1484381&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/UploadController.java
Mon May 20 06:51:01 2013
@@ -140,7 +140,15 @@ public class UploadController extends Ab
throw new ServletException(e);
}
}
-
+
+ @RequestMapping(value = "/remotelog.upload", method = RequestMethod.POST)
+ public void handleRemoteLog(HttpServletRequest request,
HttpServletResponse response) throws ServletException {
+ String message = request.getParameter("message");
+ if (message != null) {
+ log.debug("[CLIENT MESSAGE] " + message);
+ }
+ }
+
@RequestMapping(value = "/upload.upload", method = RequestMethod.POST)
public void handleFormUpload(HttpServletRequest request,
HttpServletResponse response) throws ServletException {
try {
