X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXLog.pm;h=287b766e8bdf95ad72614e49b6d997939eebb8ff;hb=refs%2Fheads%2Fnewdisc;hp=171b9373d9dacf379ed2bbe802049bb6760413bf;hpb=fd0a34c34ad4112ee21e0730f7307498ff437e18;p=spider.git diff --git a/perl/DXLog.pm b/perl/DXLog.pm index 171b9373..287b766e 100644 --- a/perl/DXLog.pm +++ b/perl/DXLog.pm @@ -38,7 +38,7 @@ use Carp; use strict; -use vars qw($log); +use vars qw($log %logs); $log = new('log', 'dat', 'm'); @@ -48,14 +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}; - return bless $ref; + $logs{$ref} = $ref; + + return $ref; } sub _genfn @@ -90,7 +93,7 @@ sub open 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 + $fh->autoflush(0); # autofluahing off $self->{fh} = $fh; # print "opening $self->{fn}\n"; @@ -146,6 +149,7 @@ sub unixtoj($$) sub write($$$) { my ($self, $jdate, $line) = @_; + return unless $self && $jdate; if (!$self->{fh} || $self->{mode} ne ">>" || $jdate->year != $self->{jdate}->year || @@ -184,10 +188,18 @@ sub close sub DESTROY { my $self = shift; + 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 @@ -200,8 +212,9 @@ sub Log sub LogDbg { + my $cat = shift; DXDebug::dbg($_) for @_; - Log(@_); + Log($cat, @_); } sub Logclose