Changeset 6072

Timestamp:

Jul 30, 2012, 2:56:10 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1704: Implement support for limiting download speed in the web client

Updated documentation and fixed an issue which made it impossible to have an unlimited download rate and a limited upload rate at the same time.

Location:

trunk

Files:

• doc/src/docbook/admin/installation.xml (modified) (2 diffs)
• doc/src/docbook/figures/server_configuration.png (modified) (previous)
• www/admin/server/configure.jsp (modified) (2 diffs)
• www/admin/server/submit_server.jsp (modified) (3 diffs)

trunk/doc/src/docbook/admin/installation.xml

@@ -1265 +1265 @@
             <variablelist>
               <varlistentry>
-                <term><guilabel>Max transfer rate</guilabel></term>
+                <term><guilabel>Max upload rate</guilabel></term>
                 <listitem>
                   <para>
@@ -1277 +1277 @@
               </varlistentry>
               <varlistentry>
+                <term><guilabel>Max download rate</guilabel></term>
+                <listitem>
+                  <para>
+                    This is a limit of how many bytes of data that should be
+                    transferred per second when downloading files from BASE. Prefixes
+                    like k, M or G can be used for larger values. The limit is per ongoing
+                    download and the default value is unlimited.
+                  </para>
+                </listitem>
+              </varlistentry>
+              <varlistentry>
                 <term><guilabel>Unlimited</guilabel></term>
                 <listitem>
                   <para>
-                    Check this to not limit the transfer rate. In this case, the
-                    Internet connection of the server is the limit.
+                    Check one or both to not limit the upload/download transfer rate.
+                    In this case, the Internet connection of the server is the limit.
                   </para>
                 </listitem>

trunk/www/admin/server/configure.jsp

@@ -147 +147 @@
           %>
           <input class="<%=theClazz%><%=writePermission ? "\"" : " disabled\" disabled readonly"%> 
+            <%=bytes==0 ? " disabled" : ""%>
             type="text" name="transfer_rate_upload" value="<%=fBytes%>" size="16" maxlength="16"> per second<br>
           
@@ -178 +179 @@
           %>
           <input class="<%=theClazz%><%=writePermission ? "\"" : " disabled\" disabled readonly"%> 
+            <%=bytes==0 ? " disabled" : ""%>
             type="text" name="transfer_rate_download" value="<%=fBytes%>" size="16" maxlength="16"> per second<br>
           

trunk/www/admin/server/submit_server.jsp

@@ -56 +56 @@
 
     // File transfer tab
-    Long bytes = new Long(0);
     ClientDefaultSetting transferRateUpload = server.getDefaultSetting("server.transferRate");
     boolean unlimitedUpload = Values.getBoolean(request.getParameter("unlimited_upload"));
@@ -62 +61 @@
     if (!unlimitedUpload && rateUpload != null)
     {
-      bytes = Values.parseBytes(rateUpload, null);
+      Long bytes = Values.parseBytes(rateUpload, null);
       if (bytes == null)
       {
         throw new WebException("popup", "Invalid byte value", "The value {1} is not a valid value.", rateUpload);
       }
+      rateUpload = bytes.toString();
     }
-    transferRateUpload.setValue(bytes.toString());
+    transferRateUpload.setValue(rateUpload == null ? "0" : rateUpload);
 
     ClientDefaultSetting transferRateDownload = server.getDefaultSetting("server.transferRate.download");
@@ -75 +75 @@
     if (!unlimitedDownload && rateDownload != null)
     {
-      bytes = Values.parseBytes(rateDownload, null);
+      Long bytes = Values.parseBytes(rateDownload, null);
       if (bytes == null)
       {
         throw new WebException("popup", "Invalid byte value", "The value {1} is not a valid value.", rateDownload);
       }
+      rateDownload = bytes.toString();
     }
-    transferRateDownload.setValue(bytes.toString());
+    transferRateDownload.setValue(rateDownload == null ? "0" : rateDownload);