[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co... |
Date: |
Fri, 31 Aug 2007 19:48:09 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 07/08/31 19:48:09
Modified files:
distrib : ChangeLog
src/daemon/common: commonOptions.ml
src/networks/bittorrent: bTMain.ml
Log message:
patch #6175
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1314&r2=1.1315
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonOptions.ml?cvsroot=mldonkey&r1=1.213&r2=1.214
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTMain.ml?cvsroot=mldonkey&r1=1.28&r2=1.29
Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1314
retrieving revision 1.1315
diff -u -b -r1.1314 -r1.1315
--- distrib/ChangeLog 31 Aug 2007 19:41:42 -0000 1.1314
+++ distrib/ChangeLog 31 Aug 2007 19:48:09 -0000 1.1315
@@ -15,6 +15,13 @@
=========
2007/08/31
+6175: Yet another patch for share_scan_interval
+- new default 30 minutes for newly created ini files
+- still use 0 to disable
+- hard-coded global minimum of 5 minutes, this updates old default 1 to 5
+- automated options update, if update is needed (options_version <= 19) and
+ share_scan_interval = 5 (because of new hard-coded minimum, which is
+ processed earlier) its changed to new default of 30
6145: EDK: Update options description of max_connected_servers (Schlumpf)
6172: EDK: properly advertise and honour noviewshared tag (TripleM)
Index: src/daemon/common/commonOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonOptions.ml,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -b -r1.213 -r1.214
--- src/daemon/common/commonOptions.ml 3 Aug 2007 22:30:19 -0000 1.213
+++ src/daemon/common/commonOptions.ml 31 Aug 2007 19:48:09 -0000 1.214
@@ -1282,9 +1282,9 @@
let share_scan_interval = define_option current_section ["share_scan_interval"]
~restart: true
"How often (in minutes) should MLDonkey scan all shared directories for
new/removed files.
- 0 to disable scanning of shared directories. Use command reshare to manually
scan shares.
- When core starts all shared directories are scanned once, independent of
this option."
- int_option 1
+ Minimum 5, 0 to disable. Use command reshare to manually scan shares.
+ When core starts, shared directories are scanned once, independent of this
option."
+ int_option 30
let create_file_mode = define_option current_section ["create_file_mode"]
"New download files are created with these rights (in octal)"
@@ -1598,7 +1598,7 @@
let options_version = define_expert_option current_section ["options_version"]
~internal: true
"(internal option)"
- int_option 19
+ int_option 20
let max_comments_per_file = define_expert_option current_section
["max_comments_per_file"]
"Maximum number of comments per file"
@@ -1732,7 +1732,7 @@
if !!min_reask_delay < 600 then min_reask_delay =:= 600
);
option_hook share_scan_interval (fun _ ->
- if !!share_scan_interval < 0 then share_scan_interval =:= 1
+ if !!share_scan_interval < 5 && !!share_scan_interval <> 0 then
share_scan_interval =:= 5
);
option_hook global_login (fun _ ->
let len = String.length !!global_login in
@@ -2175,4 +2175,8 @@
messages_filter =:= "DI-Emule|ZamBoR|Ketamine|eMule FX|AUTOMATED
MESSAGE|Hi Honey!|Do you live in my area|download HyperMule";
update 19
+ | 19 ->
+ if !!share_scan_interval = 5 then share_scan_interval =:= 30;
+ update 20
+
| _ -> ()
Index: src/networks/bittorrent/bTMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTMain.ml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- src/networks/bittorrent/bTMain.ml 22 Aug 2007 23:44:55 -0000 1.28
+++ src/networks/bittorrent/bTMain.ml 31 Aug 2007 19:48:09 -0000 1.29
@@ -77,7 +77,7 @@
lprintf "Exception in BTTracker.start_tracker: %s\n"
(Printexc2.to_string e));
if !!share_scan_interval <> 0 then
- add_session_timer enabler (float_of_int (max 300 (!!share_scan_interval *
60)))
+ add_session_timer enabler (float_of_int (!!share_scan_interval * 60))
(fun _ -> BTInteractive.share_files ();
);
if !!import_new_torrents_interval <> 0. then