First go at sane logging

2 files changed, 26 insertions, 26 deletions

diff --git a/Echolot/Pinger/CPunk.pm b/Echolot/Pinger/CPunk.pm
index 909f602..435db22 100644
--- a/Echolot/Pinger/CPunk.pm
+++ b/Echolot/Pinger/CPunk.pm
@@ -1,7 +1,7 @@
 package Echolot::Pinger::CPunk;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: CPunk.pm,v 1.10 2003/01/13 00:33:14 weasel Exp $
+# $Id: CPunk.pm,v 1.11 2003/01/14 05:25:35 weasel Exp $
 #
 
 =pod
@@ -17,19 +17,19 @@ This package provides functions for sending cypherpunk (type I) pings.
 =cut
 
 use strict;
-use Carp qw{cluck};
 use English;
 use GnuPG::Interface;
 use IO::Handle;
+use Echolot::Log;
 
 sub encrypt_to($$$$) {
 	my ($msg, $recipient, $keys, $pgp2compat) = @_;
 
 	(defined $keys->{$recipient}) or
-		cluck ("Key for recipient $recipient is not defined"),
+		Echolot::Log::warn("Key for recipient $recipient is not defined."),
 		return undef;
 	(defined $keys->{$recipient}->{'key'}) or
-		cluck ("Key->key for recipient $recipient is not defined"),
+		Echolot::Log::warn("Key->key for recipient $recipient is not defined."),
 		return undef;
 	my $keyring = Echolot::Config::get()->{'tmpdir'}.'/'.
 		Echolot::Globals::get()->{'hostname'}.".".time.'.'.$PROCESS_ID.'_'.Echolot::Globals::get()->{'internalcounter'}++.'.keyring';
@@ -66,12 +66,12 @@ sub encrypt_to($$$$) {
 	waitpid $pid, 0;
 
 	($stdout eq '') or
-		cluck("GnuPG returned something in stdout '$stdout' while adding key for '$recipient': So what?\n");
+		Echolot::Log::info("GnuPG returned something in stdout '$stdout' while adding key for '$recipient': So what?");
 	#($stderr eq '') or
-		#cluck("GnuPG returned something in stderr: '$stderr' while adding key for '$recipient'; returning\n"),
+		#Echolot::Log::warn("GnuPG returned something in stderr: '$stderr' while adding key for '$recipient'; returning."),
 		#return undef;
 	($status =~ /^^\[GNUPG:\] IMPORTED $recipient /m) or
-		cluck("GnuPG status '$status' didn't indicate key for '$recipient' was imported correctly. Returning\n"),
+		Echolot::Log::info("GnuPG status '$status' didn't indicate key for '$recipient' was imported correctly."),
 		return undef;
 
 
@@ -114,11 +114,11 @@ sub encrypt_to($$$$) {
 	$plaintextfile = Echolot::Config::get()->{'tmpdir'}.'/'.
 		Echolot::Globals::get()->{'hostname'}.".".time.'.'.$PROCESS_ID.'_'.Echolot::Globals::get()->{'internalcounter'}++.'.plaintext';
 	open (F, '>'.$plaintextfile) or
-		cluck("Cannot open $plaintextfile for writing: $!"),
+		Echolot::Log::warn("Cannot open $plaintextfile for writing: $!."),
 		return 0;
 	print (F $msg);
 	close (F) or
-		cluck("Cannot close $plaintextfile"),
+		Echolot::Log::warn("Cannot close $plaintextfile."),
 		return 0;
 	push @$command_args, $plaintextfile;
 
@@ -134,21 +134,21 @@ sub encrypt_to($$$$) {
 	waitpid $pid, 0;
 
 	#($stderr eq '') or
-		#cluck("GnuPG returned something in stderr: '$stderr' while encrypting to '$recipient'; returning"),
+		#Echolot::Log::warn("GnuPG returned something in stderr: '$stderr' while encrypting to '$recipient'."),
 		#return undef;
 	(($status =~ /^^\[GNUPG:\] BEGIN_ENCRYPTION\s/m) &&
 	 ($status =~ /^^\[GNUPG:\] END_ENCRYPTION\s/m)) or
-		cluck("GnuPG status '$status' didn't indicate message to '$recipient' was encrypted correctly (stderr: $stderr; args: ".join(' ', @$command_args)."). Returning\n"),
+		Echolot::Log::info("GnuPG status '$status' didn't indicate message to '$recipient' was encrypted correctly (stderr: $stderr; args: ".join(' ', @$command_args).")."),
 		return undef;
 
 	unlink ($keyring) or
-		cluck("Cannot unlink tmp keyring '$keyring'"),
+		Echolot::Log::warn("Cannot unlink tmp keyring '$keyring'."),
 		return undef;
 	unlink ($keyring.'~'); # gnupg does those evil backups
 
 	(defined $plaintextfile) and 
 		( unlink ($plaintextfile) or
-			cluck("Cannot unlink tmp keyring '$plaintextfile'"),
+			Echolot::Log::warn("Cannot unlink tmp keyring '$plaintextfile'."),
 			return undef);
 
 
@@ -156,16 +156,16 @@ sub encrypt_to($$$$) {
 
 	$plaintextfile .= '.asc';
 	open (F, '<'.$plaintextfile) or
-		cluck("Cannot open $plaintextfile for reading $!"),
+		Echolot::Log::warn("Cannot open $plaintextfile for reading: $!."),
 		return 0;
 	$result = join '', <F>;
 	close (F) or
-		cluck("Cannot close $plaintextfile"),
+		Echolot::Log::warn("Cannot close $plaintextfile."),
 		return 0;
 
 	(defined $plaintextfile) and 
 		( unlink ($plaintextfile) or
-			cluck("Cannot unlink tmp keyring '$plaintextfile'"),
+			Echolot::Log::warn("Cannot unlink tmp keyring '$plaintextfile'."),
 			return undef);
 
 	$result =~ s,^Version: .*$,Version: N/A,m;
@@ -186,7 +186,7 @@ sub ping($$$$$) {
 		if ($hop->{'encrypt'}) {
 			my $encrypted = encrypt_to($msg, $hop->{'keyid'}, $keys, $pgp2compat);
 			(defined $encrypted) or 
-				cluck("Encrypted is undefined"),
+				Echolot::Log::debug("Encrypted is undefined."),
 				return undef;
 			$msg = "::\n".
 				"Encrypted: PGP\n".
diff --git a/Echolot/Pinger/Mix.pm b/Echolot/Pinger/Mix.pm
index 40d2d9b..7bca883 100644
--- a/Echolot/Pinger/Mix.pm
+++ b/Echolot/Pinger/Mix.pm
@@ -1,7 +1,7 @@
 package Echolot::Pinger::Mix;
 
 # (c) 2002 Peter Palfrader <peter@palfrader.org>
-# $Id: Mix.pm,v 1.9 2002/09/10 20:03:20 weasel Exp $
+# $Id: Mix.pm,v 1.10 2003/01/14 05:25:35 weasel Exp $
 #
 
 =pod
@@ -17,8 +17,8 @@ This package provides functions for sending mixmaster (type II) pings.
 =cut
 
 use strict;
-use Carp qw{cluck};
 use English;
+use Echolot::Log;
 
 sub ping($$$$) {
 	my ($body, $to, $chain, $keys) = @_;
@@ -27,25 +27,25 @@ sub ping($$$$) {
 
 	my $keyring = Echolot::Config::get()->{'mixhome'}.'/pubring.mix';
 	open (F, '>'.$keyring) or
-		cluck("Cannot open $keyring for writing: $!"),
+		Echolot::Log::warn("Cannot open $keyring for writing: $!."),
 		return 0;
 	for my $keyid (keys %$keys) {
 		print (F $keys->{$keyid}->{'summary'}, "\n\n");
 		print (F $keys->{$keyid}->{'key'},"\n\n");
 	};
 	close (F) or
-		cluck("Cannot close $keyring: $!"),
+		Echolot::Log::warn("Cannot close $keyring: $!."),
 		return 0;
 
 	my $type2list = Echolot::Config::get()->{'mixhome'}.'/type2.list';
 	open (F, '>'.$type2list) or
-		cluck("Cannot open $type2list for writing: $!"),
+		Echolot::Log::warn("Cannot open $type2list for writing: $!."),
 		return 0;
 	for my $keyid (keys %$keys) {
 		print (F $keys->{$keyid}->{'summary'}, "\n");
 	};
 	close (F) or
-		cluck("Cannot close $type2list: $!"),
+		Echolot::Log::warn("Cannot close $type2list: $!."),
 		return 0;
 	
 	my $mixcfg = Echolot::Config::get()->{'mixhome'}.'/mix.cfg';
@@ -53,7 +53,7 @@ sub ping($$$$) {
 	              Echolot::Config::get()->{'my_domain'};
 	my $sendmail = Echolot::Config::get()->{'sendmail'};
 	open (F, ">$mixcfg") or
-		cluck("Cannot open $mixcfg for writing: $!"),
+		Echolot::Log::warn("Cannot open $mixcfg for writing: $!."),
 		return 0;
 	print (F "REMAIL          n\n");
 	print (F "NAME            Echolot Pinger\n");
@@ -62,12 +62,12 @@ sub ping($$$$) {
 	print (F "TYPE2LIST       type2.list\n");
 	print (F "SENDMAIL        $sendmail -f $address -t\n");
 	close (F) or
-		cluck("Cannot close $mixcfg: $!"),
+		Echolot::Log::warn("Cannot close $mixcfg: $!."),
 		return 0;
 	
 	$ENV{'MIXPATH'} = Echolot::Config::get()->{'mixhome'};
 	open(MIX, "|".Echolot::Config::get()->{'mixmaster'}." -m -S -l $chaincomma") or
-		cluck("Cannot exec mixpinger: $!"),
+		Echolot::Log::warn("Cannot exec mixpinger: $!."),
 		return 0;
 	print MIX "To: $to\n\n$body\n";
 	close (MIX);