X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXCommandmode.pm;h=404a7391af2c6bc59d76b28936cc0cc0b2d98720;hb=fcabf1831276e7fd1db8eb16a4b6f220db6408e5;hp=9b395c0cea691c70b543423c33dcf34509d48db6;hpb=06392dc488efff54948322d2c312f2899d12b7d9;p=spider.git

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index 9b395c0c..404a7391 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -93,7 +93,7 @@ sub start
 	my $host = $self->{conn}->{peerhost};
 	$host ||= "AGW Port #$self->{conn}->{agwport}" if exists $self->{conn}->{agwport};
 	$host ||= "unknown";
-	Log('DXCommand', "$call connected from $host");
+	LogDbg('DXCommand', "$call connected from $host");
 
 	$self->{name} = $name ? $name : $call;
 	$self->send($self->msg('l2',$self->{name}));
@@ -297,7 +297,7 @@ sub normal
 					my @bad;
 					if (@bad = BadWords::check($l)) {
 						$self->badcount(($self->badcount||0) + @bad);
-						Log('DXCommand', "$self->{call} swore: $l");
+						LogDbg('DXCommand', "$self->{call} swore: $l with words:" . join(',', @bad) . ")");
 					} else {
 						for (@{$self->{talklist}}) {
 							$self->send_talks($_, $l);
@@ -311,7 +311,7 @@ sub normal
 			my @bad;
 			if (@bad = BadWords::check($cmdline)) {
 				$self->badcount(($self->badcount||0) + @bad);
-				Log('DXCommand', "$self->{call} swore: $cmdline");
+				LogDbg('DXCommand', "$self->{call} swore: $cmdline with words:" . join(',', @bad) . ")");
 			} else {
 				for (@{$self->{talklist}}) {
 					$self->send_talks($_, $rawline);
@@ -343,7 +343,7 @@ sub normal
 
 	# check for excessive swearing
 	if ($self->{badcount} && $self->{badcount} >= $maxbadcount) {
-		Log('DXCommand', "$self->{call} logged out for excessive swearing");
+		LogDbg('DXCommand', "$self->{call} logged out for excessive swearing");
 		$self->disconnect;
 		return;
 	}
@@ -432,7 +432,8 @@ sub run_cmd
 	
 
 	return () if length $cmdline == 0;
-		
+	
+	
 	# split the command line up into parts, the first part is the command
 	my ($cmd, $args) = split /\s+/, $cmdline, 2;
 	$args = "" unless defined $args;
@@ -561,7 +562,7 @@ sub disconnect
 	# send info to all logged in thingies
 	$self->tell_login('logoutu');
 
-	Log('DXCommand', "$call disconnected");
+	LogDbg('DXCommand', "$call disconnected");
 
 	$self->SUPER::disconnect;
 }
@@ -1025,8 +1026,7 @@ sub import_cmd
 	# are there any to do in this directory?
 	return unless -d $cmdimportdir;
 	unless (opendir(DIR, $cmdimportdir)) {
-		dbg("can\'t open $cmdimportdir $!");
-		Log('err', "can\'t open $cmdimportdir $!");
+		LogDbg('err', "can\'t open $cmdimportdir $!");
 		return;
 	} 
 
@@ -1038,9 +1038,7 @@ sub import_cmd
 
 		my $s = Script->new($name, $cmdimportdir);
 		if ($s) {
-
-			dbg("Run import cmd file $name");
-			Log('DXCommand', "Run import cmd file $name");
+			LogDbg('DXCommand', "Run import cmd file $name");
 			my @cat = split /[^A-Za-z0-9]+/, $name;
 			my ($call) = grep {is_callsign(uc $_)} @cat;
 			$call ||= $main::mycall;
@@ -1071,19 +1069,16 @@ sub import_cmd
 						$dxchan->{priv} = $priv;
 						$dxchan->{user} = $user;
 					} else {
-						Log('err', "Trying to run import cmd for non-existant user $call");
-						dbg( "Trying to run import cmd for non-existant user $call");
+						LogDbg('err', "Trying to run import cmd for non-existant user $call");
 					}
 				}
 			}
 			$s->erase;
 			for (@out) {
-				Log('DXCommand', "Import cmd $name/$call: $_");
-				dbg("Import cmd $name/$call: $_");
+				LogDbg('DXCommand', "Import cmd $name/$call: $_");
 			}
 		} else {
-			Log("Failed to open $cmdimportdir/$name $!");
-			dbg("Failed to open $cmdimportdir/$name $!");
+			LogDbg('err', "Failed to open $cmdimportdir/$name $!");
 			unlink "$cmdimportdir/$name";
 		}
 	}