disable some debug messages

2 files changed, 11 insertions, 9 deletions

diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index 8b9334ef..869b047c 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -3,7 +3,7 @@
 # Copyright (C) 2000,2001,2002 Ken'ichi Fukamachi
 #          All rights reserved.
 #
-# $FML: Distribute.pm,v 1.84 2002/07/15 15:27:14 fukachan Exp $
+# $FML: Distribute.pm,v 1.85 2002/07/23 13:03:13 fukachan Exp $
 #
 
 package FML::Process::Distribute;
@@ -307,7 +307,7 @@ sub _distribute
     my $id = $article->increment_id;
 
     # XXX debug, remove here in the future
-    {
+    if ($debug) {
 	my $ha_msg = $curproc->{ article }->{ body }->data_type_list;
 	for (@$ha_msg) { Log("debug: $_");}
     }
diff --git a/fml/lib/Mail/ThreadTrack/Analyze.pm b/fml/lib/Mail/ThreadTrack/Analyze.pm
index 0ed5ee27..8c87d787 100644
--- a/fml/lib/Mail/ThreadTrack/Analyze.pm
+++ b/fml/lib/Mail/ThreadTrack/Analyze.pm
@@ -4,7 +4,7 @@
 #   All rights reserved. This program is free software; you can
 #   redistribute it and/or modify it under the same terms as Perl itself.
 #
-# $FML: Analyze.pm,v 1.24 2002/01/16 13:43:22 fukachan Exp $
+# $FML: Analyze.pm,v 1.25 2002/02/01 12:04:03 fukachan Exp $
 #
 
 package Mail::ThreadTrack::Analyze;
@@ -102,7 +102,7 @@ sub assign
 	    $self->log("speculated id=$thread_id");
 	}
 	else {
-	    $self->log("(debug) fail to spelucate thread_id");
+	    $self->log("(debug) fail to spelucate thread_id") if $debug;
 	}
     }
 
@@ -131,7 +131,7 @@ sub assign
 	$self->_append_thread_status_info("found");
     }
     else {
-	$self->log("message without thread_id");
+	$self->log("message without thread_id") if $debug;
 
 	my $id = $self->_assign_new_thread_id_number();
 
@@ -163,7 +163,7 @@ sub _assign_new_thread_id_number
 	$id = $self->increment_id();
     }
 
-    $self->log("assign thread_id=$id");
+    $self->log("assign thread_id=$id") if $debug;
     return $id;
 }
 
@@ -415,7 +415,7 @@ sub _extract_thread_id_in_subject
 	return $id;
     }
     else {
-	$self->log("no thread id /$regexp/ in subject");
+	$self->log("no thread id /$regexp/ in subject") if $debug;
 	return 0;
     }
 }
@@ -465,7 +465,9 @@ sub _speculate_thread_id_from_header
 	$self->db_close();
     }
 
-    $self->log("(debug) not speculated") unless $result;
+    if ($debug) {
+        $self->log("(debug) not speculated") unless $result;
+    }
     $result;
 }
 
@@ -553,7 +555,7 @@ sub _update_db
     my $thread_id  = $self->get_thread_id();
 
     # 0. logging
-    $self->log("article_id=$article_id thread_id=$thread_id");
+    $self->log("article_id=$article_id thread_id=$thread_id") if $debug;
 
     # prepare hash table tied to db_dir/*db's
     my $rh = $self->{ _hash_table };