Media Proxy Fixes and Life Time Settings added

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6649 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/mediaproxy/MediaProxy.java

@@ -33,7 +33,7 @@ public class MediaProxy implements SessionListener {
     private int minPort = 10000;
     private int maxPort = 20000;
 
-    private long idleTime = 90000;
+    private long idleTime = 60;
 
     // Lifetime of a Channel in Seconds
     private long lifetime = 9000;
@@ -131,8 +131,9 @@ public class MediaProxy implements SessionListener {
 
     /**
      * Get the Life Time of a channel in seconds
-     *
-     * @return Life Time in Seconds
+     * Life Time is the maximum time that a Session can live. After this time the session will be destroyed even if it´s active.
+     * 
+     * @return the Life Time in Seconds
      */
     public long getLifetime() {
         return lifetime;
@@ -140,8 +141,9 @@ public class MediaProxy implements SessionListener {
 
     /**
      * Sets the Life Time of a Channel in seconds
+     * Life Time is the maximum time that a Session can live. After this time the session will be destroyed even if it´s active.
      *
-     * @param lifetime Life Time in Seconds
+     * @param lifetime the Life Time in Seconds
      */
     public void setLifetime(long lifetime) {
         this.lifetime = lifetime;

src/java/org/jivesoftware/wildfire/mediaproxy/MediaProxyService.java

@@ -71,6 +71,14 @@ public class MediaProxyService extends BasicModule implements ServerItemsProvide
         catch (NumberFormatException e) {
             // Do nothing let the default values to be used.
         }
+        try {
+            long lifetime =
+                    Long.valueOf(JiveGlobals.getProperty("mediaproxy.lifetime"));
+            mediaProxy.setLifetime(lifetime);
+        }
+        catch (NumberFormatException e) {
+            // Do nothing let the default values to be used.
+        }
         try {
             int minPort = Integer.valueOf(JiveGlobals.getProperty("mediaproxy.portMin"));
             mediaProxy.setMinPort(minPort);
@@ -444,4 +452,20 @@ public class MediaProxyService extends BasicModule implements ServerItemsProvide
     public void stopAgents() {
         mediaProxy.stopProxy();
     }
+
+    /**
+     * Get the Life Time of Sessions
+     * @return lifetime in seconds
+     */
+    public long getLifetime(){
+        return mediaProxy.getLifetime();
+    }
+
+    /**
+     * Set the Life time of Sessions
+     * @param lifetime lifetime in seconds
+     */
+    public void setLifetime(long lifetime){
+        mediaProxy.setLifetime(lifetime);
+    }
 }

src/web/media-proxy.jsp

@@ -31,17 +31,25 @@
     boolean save = request.getParameter("update") != null;
     boolean success = false;
 
-    long keepAliveDelay = 0;
+    long keepAliveDelay = 3600;
+    long lifetime = 0;
     int minPort = 10000;
     int maxPort = 20000;
-    boolean enabled = false;
+    boolean enabled = true;
 
     if (save) {
-        keepAliveDelay = ParamUtils.getLongParameter(request, "keepalive", keepAliveDelay);
+        keepAliveDelay = ParamUtils.getLongParameter(request, "idleTimeout", keepAliveDelay);
         if (keepAliveDelay > 50) {
-            mediaProxyService.setKeepAliveDelay(keepAliveDelay);
+            mediaProxyService.setKeepAliveDelay(keepAliveDelay * 1000);
             JiveGlobals
-                    .setProperty("mediaproxy.keepalive", String.valueOf(keepAliveDelay));
+                    .setProperty("mediaproxy.idleTimeout", String.valueOf(keepAliveDelay));
+        }
+
+        lifetime = ParamUtils.getLongParameter(request, "lifetime", lifetime);
+        if (lifetime > 0) {
+            mediaProxyService.setLifetime(lifetime);
+            JiveGlobals
+                    .setProperty("mediaproxy.lifetime", String.valueOf(lifetime));
         }
 
         minPort = ParamUtils.getIntParameter(request, "minport", minPort);
@@ -112,22 +120,47 @@
                             <b>Enabled</b>
                             - This server will act as a media proxy.
                         </label>
-                        <br><br>
-
-                        Session Idle Timeout (in seconds):&nbsp<input type="text" size="5" maxlength="8"
-                                                                      name="idleTimeout"
-                                                                      value="<%=mediaProxyService.getIdleTime()/1000%>"
-                                                                      align="left">
-                        <br>
-
-                        Port Range Min:
-                        <input type="text" size="7" maxlength="20" name="minport"
-                               value="<%=mediaProxyService.getMinPort()%>">
                         <br>
-                        Port Range Max:
-                        <input type="text" size="7" maxlength="20" name="maxport"
-                               value="<%=mediaProxyService.getMaxPort()%>">
+                        <table>
+                            <tr>
+                                <td>Session Idle Timeout (in seconds):&nbsp;
+                                </td>
+                                <td>
+                                    <input type="text" size="5" maxlength="8"
+                                           name="idleTimeout"
+                                           value="<%=(long)mediaProxyService.getIdleTime()/1000%>"
+                                           align="left">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Session Life Time (in seconds):&nbsp;
+                                </td>
+                                <td>
+                                    <input type="text" size="5" maxlength="8"
+                                           name="lifetime"
+                                           value="<%=mediaProxyService.getLifetime()%>"
+                                           align="left"> &nbsp;<i>Life Time is the maximum time that a Session can
+                                    lives. After this time it is destroyed, even if it stills active.</i>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td>Port Range Min:&nbsp;
+                                </td>
+                                <td>
+                                    <input type="text" size="7" maxlength="20" name="minport"
+                                           value="<%=mediaProxyService.getMinPort()%>">
+                                </td>
+                            </tr>
+                            <tr>
+                                <td> Port Range Max:&nbsp;
+                                </td>
+                                <td>
+                                    <input type="text" size="7" maxlength="20" name="maxport"
+                                           value="<%=mediaProxyService.getMaxPort()%>">
 
+                                </td>
+                            </tr>
+                        </table>
                     </td>
                 </tr>
                 <tr>
@@ -151,7 +184,7 @@
     <input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
 </form>
 
-<% if (enabled) { %>
+<% if (mediaProxyService.isEnabled()) { %>
 
 <p>
     <b>Active Sessions Summary</b><br>