X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLog.pm;h=a332d39208336c26c5c9c012bc4a3a7b6ac6959a;hb=5094a0b55d903d344277adf9d26b5af8e37247d8;hp=e8d289b0995079b531eb0ce8ff1431626583db3a;hpb=a9bc2c5a87691ca5bed6e408c5908695bd65387a;p=spider.git

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index e8d289b0..a332d392 100644
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -38,9 +38,7 @@ use Carp;
 
 use strict;
 
-use vars qw($log);
-
-our %logobj;
+use vars qw($log %logs);
 
 $log = new('log', 'dat', 'm');
 
@@ -50,16 +48,17 @@ $log = new('log', 'dat', 'm');
 sub new
 {
 	my ($prefix, $suffix, $sort) = @_;
-	my $ref = {};
-	$ref->{prefix} = "$main::data/$prefix";
+	my $ref = bless {}, __PACKAGE__;
+	localdata_mv($prefix);
+	$ref->{prefix} = "$main::local_data/$prefix";
 	$ref->{suffix} = $suffix if $suffix;
 	$ref->{sort} = $sort;
 	
 	# make sure the directory exists
 	mkdir($ref->{prefix}, 0777) unless -e $ref->{prefix};
-	my $self = bless $ref;
-	$logobj{$self} = $self;
-	return $self;
+	$logs{$ref} = $ref;
+	
+	return $ref;
 }
 
 sub _genfn
@@ -94,7 +93,7 @@ sub open
 	
 	my $fh = new IO::File $self->{fn}, $mode, 0666;
 	return undef if !$fh;
-	$fh->autoflush(0) if $mode ne 'r'; # make it (not) autoflushing if writable
+	$fh->autoflush(0);			# autofluahing off
 	$self->{fh} = $fh;
 
 #	print "opening $self->{fn}\n";
@@ -102,6 +101,13 @@ sub open
 	return $self->{fh};
 }
 
+sub fn
+{
+	my ($self, $jdate) = @_;
+	
+	return $self->_genfn($jdate);
+}
+
 sub delete($$)
 {
 	my ($self, $jdate) = @_;
@@ -150,6 +156,7 @@ sub unixtoj($$)
 sub write($$$)
 {
 	my ($self, $jdate, $line) = @_;
+	return unless $self && $jdate;
 	if (!$self->{fh} || 
 		$self->{mode} ne ">>" || 
 		$jdate->year != $self->{jdate}->year || 
@@ -185,21 +192,21 @@ sub close
 	delete $self->{fh};	
 }
 
-sub flush_all
-{
-	foreach my $l (values %logobj) {
-		$l->{fh}->flush if exists $l->{fh};
-	}
-}
-
 sub DESTROY
 {
 	my $self = shift;
-	delete $logobj{$self};
+	delete $logs{$self};
 	undef $self->{fh};			# close the filehandle
 	delete $self->{fh} if $self->{fh};
 }
 
+sub flushall
+{
+	foreach my $l (values %logs) {
+		$l->{fh}->flush if exists $l->{fh};
+	}
+}
+
 # log something in the system log 
 # this routine is exported to any module that declares DXLog
 # it takes all its args and joins them together with the unixtime writes them out as one line
@@ -212,8 +219,12 @@ sub Log
 
 sub LogDbg
 {
-	DXDebug::dbg($_) for @_;
-	Log(@_);
+	my $cat = shift;
+	foreach my $m (@_) {
+		DXDebug::dbgsetcat($cat);
+		DXDebug::dbg($m);
+		Log($cat, $m);
+	}
 }
 
 sub Logclose