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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/08/28 18:19:16

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonSwarming.ml 
        src/networks/donkey: donkeyComplexOptions.ml 
        src/networks/fasttrack: fasttrackProto.ml 
        src/networks/gnutella: gnutellaHandler.ml 

Log message:
        patch #5333

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.976&r2=1.977
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonSwarming.ml?cvsroot=mldonkey&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyComplexOptions.ml?cvsroot=mldonkey&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/fasttrack/fasttrackProto.ml?cvsroot=mldonkey&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaHandler.ml?cvsroot=mldonkey&r1=1.14&r2=1.15

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.976
retrieving revision 1.977
diff -u -b -r1.976 -r1.977
--- distrib/ChangeLog   28 Aug 2006 18:17:47 -0000      1.976
+++ distrib/ChangeLog   28 Aug 2006 18:19:15 -0000      1.977
@@ -15,6 +15,7 @@
 =========
 
 2006/08/28
+5333: Clean logging (Swarmer, Fasttrack, Gnutella)
 5332: New command option: rem blocked - remove all IP blocked servers
 5330: Configure: Check MinGW version, at least 3.10 is needed (Schlumpf)
 5329: some configure improvements and cleanups (Schlumpf)

Index: src/daemon/common/commonSwarming.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonSwarming.ml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- src/daemon/common/commonSwarming.ml 12 Aug 2006 20:36:14 -0000      1.51
+++ src/daemon/common/commonSwarming.ml 28 Aug 2006 18:19:15 -0000      1.52
@@ -2910,7 +2910,7 @@
 let propagate_chunk t1 pos1 size destinations copy_data =
   List.iter (fun (t2, j2, pos2) ->
     if t1.t_num <> t2.t_num || pos1 <> pos2 then begin
-      lprintf_nl "Should propagate chunk from %s %Ld to %s %Ld [%Ld]"
+      if !verbose then lprintf_nl "Should propagate chunk from %s %Ld to %s 
%Ld [%Ld]"
         (file_best_name t1.t_file) pos1
         (file_best_name t2.t_file) pos2 size;
       (* small catch here: if we don't really copy the data *and*

Index: src/networks/donkey/donkeyComplexOptions.ml
===================================================================
RCS file: 
/sources/mldonkey/mldonkey/src/networks/donkey/donkeyComplexOptions.ml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- src/networks/donkey/donkeyComplexOptions.ml 27 Jul 2006 21:46:13 -0000      
1.53
+++ src/networks/donkey/donkeyComplexOptions.ml 28 Aug 2006 18:19:15 -0000      
1.54
@@ -542,7 +542,7 @@
       Options.load file_sources_ini;
       cleaner ();
       sources_loaded := true;
-      lprintf "loading sources completed) ";
+      lprintf "(loading sources completed) ";
     with _ -> ())
 
 let check_result r tags =

Index: src/networks/fasttrack/fasttrackProto.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/fasttrack/fasttrackProto.ml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/networks/fasttrack/fasttrackProto.ml    9 May 2006 08:40:25 -0000       
1.16
+++ src/networks/fasttrack/fasttrackProto.ml    28 Aug 2006 18:19:16 -0000      
1.17
@@ -1006,7 +1006,7 @@
 
             let computed_checksum = 
               Int64.of_int (fst_hash_checksum shared_hash) in
-            if computed_checksum <> shared_checksum then begin
+            if computed_checksum <> shared_checksum && !verbose then begin
                 lprintf "Bad COMPUTED checksum for hash\n";
               end;
             let shared_hash = Md5Ext.direct_of_string shared_hash in
@@ -1074,7 +1074,7 @@
 
                 let computed_checksum = 
                   Int64.of_int (fst_hash_checksum result_hash) in
-                if computed_checksum <> result_checksum then begin
+                if computed_checksum <> result_checksum && !verbose then begin
                     lprintf "Bad COMPUTED checksum for hash\n";
                   end;
 
@@ -1257,7 +1257,7 @@
 
             let computed_checksum = 
               Int64.of_int (fst_hash_checksum shared_hash) in
-            if computed_checksum <> shared_checksum then begin
+            if computed_checksum <> shared_checksum && !verbose then begin
                 lprintf "Bad COMPUTED checksum for hash\n";
               end;
             let shared_hash = Md5Ext.direct_of_string shared_hash in

Index: src/networks/gnutella/gnutellaHandler.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaHandler.ml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/networks/gnutella/gnutellaHandler.ml    19 May 2006 23:43:55 -0000      
1.14
+++ src/networks/gnutella/gnutellaHandler.ml    28 Aug 2006 18:19:16 -0000      
1.15
@@ -254,7 +254,7 @@
 (* probably XML. print to remember that we should be able to use this
 information. *)
               else
-                  lprintf "info: %s\n" (String.escaped s);
+                if !verbose then lprintf "info: %s\n" (String.escaped s);
           ) f.Q.info;
           
           if !verbose then