[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/09/03 11:47:33

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml commonSwarming.ml 
        src/daemon/driver: driverInteractive.ml 
        src/networks/donkey: donkeyMain.ml donkeyOptions.ml 

Log message:
        patch #5364

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.987&r2=1.988
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.172&r2=1.173
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSwarming.ml?cvsroot=mldonkey&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyMain.ml?cvsroot=mldonkey&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOptions.ml?cvsroot=mldonkey&r1=1.49&r2=1.50

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.987
retrieving revision 1.988
diff -u -b -r1.987 -r1.988
--- distrib/ChangeLog   3 Sep 2006 11:45:55 -0000       1.987
+++ distrib/ChangeLog   3 Sep 2006 11:47:32 -0000       1.988
@@ -15,6 +15,7 @@
 =========
 
 2006/09/03
+5364: Update options descriptions, remove obsolete options, clean log
 5363: Limit max_hard_download_rate when max_hard_upload_rate < 10
 - upload >= 10    -> unlimited download
 - upload < 10 > 3 -> download limited to upload * 4

Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -b -r1.172 -r1.173
--- src/daemon/common/commonOptions.ml  3 Sep 2006 11:45:55 -0000       1.172
+++ src/daemon/common/commonOptions.ml  3 Sep 2006 11:47:33 -0000       1.173
@@ -1549,7 +1549,8 @@
     int_option 300
 
 let log_file_size = define_expert_option current_section ["log_file_size"]
-   "Maximum size of log_file in MB"
+   "Maximum size of log_file in MB, this value is only checked on startup,
+   log_file will be deleted if its bigger than log_file_size."
      int_option 2
 
 let log_file = define_expert_option current_section ["log_file"]

Index: src/daemon/common/commonSwarming.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSwarming.ml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- src/daemon/common/commonSwarming.ml 28 Aug 2006 18:19:15 -0000      1.52
+++ src/daemon/common/commonSwarming.ml 3 Sep 2006 11:47:33 -0000       1.53
@@ -2841,7 +2841,9 @@
                        (try
                          preallocate_disk_space tprim 
                            r.range_begin file_end
-                       with e ->
+                       with
+                         End_of_file -> ()
+                       | e ->
                          lprintf_nl "Exception %s while preallocating disk 
space [%Ld-%Ld] for %s"
                            (Printexc2.to_string e) 
                            r.range_begin file_end

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- src/daemon/driver/driverInteractive.ml      1 Sep 2006 17:17:58 -0000       
1.97
+++ src/daemon/driver/driverInteractive.ml      3 Sep 2006 11:47:33 -0000       
1.98
@@ -2218,8 +2218,6 @@
 end
 
 let filenames_variability o list =
-  let debug = false in
-
   (* over this number of filenames, exact variability is not computed
      (too expensive) *)
   let bypass_threshold = 100 in

Index: src/networks/donkey/donkeyMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- src/networks/donkey/donkeyMain.ml   1 Sep 2006 16:19:56 -0000       1.54
+++ src/networks/donkey/donkeyMain.ml   3 Sep 2006 11:47:33 -0000       1.55
@@ -83,6 +83,7 @@
   DonkeyServers.udp_walker_timer ()
 
 let five_second_timer timer =
+  DonkeyServers.check_server_connections;
   DonkeyServers.walker_timer ();
   DonkeyOneFile.check_files_downloaded ();
   DonkeyShare.check_shared_files ()
@@ -312,10 +313,6 @@
           DonkeyServers.udp_query_sources ()
          );
       
-      add_session_option_timer enabler check_connections_delay 
-        DonkeyServers.check_server_connections;
-
-      
       add_session_timer enabler 3600. hourly_timer;
       add_session_timer enabler 60. min_timer;
       add_session_timer enabler 300. fivemin_timer;

Index: src/networks/donkey/donkeyOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOptions.ml,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- src/networks/donkey/donkeyOptions.ml        21 Aug 2006 18:31:55 -0000      
1.49
+++ src/networks/donkey/donkeyOptions.ml        3 Sep 2006 11:47:33 -0000       
1.50
@@ -37,10 +37,6 @@
   "Delay used to request file sources"
     float_option 180.0
 
-let check_connections_delay = define_expert_option donkey_section 
["check_connections_delay"]
-  "The delay between server connection rounds"
-    float_option 5.0
-
 let client_timeout = define_expert_option donkey_section ["client_timeout"]
   "Timeout on client connections when not queued"
     float_option 40.
@@ -49,12 +45,8 @@
   "The number of servers you want to stay connected to"
     int_option 3
 
-let max_udp_sends = define_expert_option donkey_section ["max_udp_sends"]
-  "The number of UDP packets you send every check_client_connections_delay"
-    int_option 10
-
 let reliable_sources = define_option donkey_section ["reliable_sources"]
-  "Should mldonkey try to detect sources responsible for corruption and ban 
them"
+  "Should mldonkey try to detect sources responsible for corruption and ban 
them, currently disabled"
     bool_option true
 
 let ban_identity_thieves = define_option donkey_section 
["ban_identity_thieves"]