X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLog.pm;h=8281e154e86f6998ecbc25d48d5652de9be76c28;hb=a53dd3ac43ba8336e30057aa39220e71c925a197;hp=c699413717534370ae4ab60536f75b1b8427931a;hpb=cce161221036760959ff1d0b7628a55942bf558a;p=spider.git

diff --git a/perl/DXLog.pm b/perl/DXLog.pm
index c6994137..8281e154 100644
--- a/perl/DXLog.pm
+++ b/perl/DXLog.pm
@@ -27,9 +27,9 @@ package DXLog;
 
 require Exporter;
 @ISA = qw(Exporter);
-@EXPORT = qw(Log);
+@EXPORT = qw(Log Logclose);
 
-use FileHandle;
+use IO::File;
 use DXVars;
 use DXDebug ();
 use DXUtil;
@@ -66,9 +66,6 @@ sub open
 	if (defined $mode) {
 		my $dir = "$self->{prefix}/$year";
 		mkdir($dir, 0777) if ! -e $dir;
-		$self->{mode} = $mode;
-	} else {
-		delete $self->{mode};
 	}
 	
 	$self->{fn} = sprintf "$self->{prefix}/$year/%02d", $thing if $self->{'sort'} eq 'm';
@@ -76,7 +73,9 @@ sub open
 	$self->{fn} .= ".$self->{suffix}" if $self->{suffix};
 	
 	$mode = 'r' if !$mode;
-	my $fh = new FileHandle $self->{fn}, $mode;
+	$self->{mode} = $mode;
+	
+	my $fh = new IO::File $self->{fn}, $mode, 0666;
 	return undef if !$fh;
 	$fh->autoflush(1) if $mode ne 'r'; # make it autoflushing if writable
 	$self->{fh} = $fh;
@@ -162,8 +161,14 @@ sub close
 {
 	my $self = shift;
 	undef $self->{fh};			# close the filehandle
-	delete $self->{fh};
-	delete $self->{mode};
+	delete $self->{fh};	
+}
+
+sub DESTROY
+{
+	my $self = shift;
+	undef $self->{fh};			# close the filehandle
+	delete $self->{fh} if $self->{fh};
 }
 
 # log something in the system log 
@@ -176,10 +181,8 @@ sub Log
 	$log->writeunix($t, join('^', $t, @_) );
 }
 
-sub DESTROY						# catch undefs and do what is required further down the tree
+sub Logclose
 {
-	my $self = shift;
-	DXDebug::dbg("dxlog", "closing $self->{fn}\n");
-	undef $self->{fh} if defined $self->{fh};
-} 
+	$log->close();
+}
 1;